Fixed indexing to support utf-8 characters in strings (#91)

* Fixed indexing to support utf-8 characters in strings * Added special characters to matlab_04.m
lanl-ansi · Mar 21, 2023 · 798dc01 · 798dc01
1 parent 0865289
commit 798dc01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/io/matlab.jl b/src/io/matlab.jl
@@ -224,7 +224,7 @@ function split_line(mp_line::AbstractString)
     isquote(c) = (c == '\'' || c == '"')
 
     function _push_curr_token()
-        if curr_pos <= length(mp_line)
+        if curr_pos <= lastindex(mp_line)
             curr_token *= mp_line[curr_pos]
         end
         curr_token = strip(curr_token)
@@ -238,14 +238,14 @@ function split_line(mp_line::AbstractString)
 
     function _push_curr_char()
         curr_token *= mp_line[curr_pos]
-        curr_pos += 1
+        curr_pos = nextind(mp_line, curr_pos)
     end
 
     curr_pos = 1
-    while curr_pos <= length(mp_line)
+    while curr_pos <= lastindex(mp_line)
         if is_curr_token_quote
             if mp_line[curr_pos] == curr_token[1]
-                if mp_line[curr_pos-1] == '\\'
+                if mp_line[prevind(mp_line, curr_pos)] == '\\'
                     # If we are inside a quote and we see slash-quote, we should
                     # treat the quote character as a regular character.
                     _push_curr_char()

diff --git a/test/data/matlab_04.m b/test/data/matlab_04.m
@@ -1,9 +1,9 @@
-% case to test matlab quotes
+% case to test matlab quotes and special characters
 
 function mpc = matlab_04
 
 mpc.names = {
-	'Slack Bus 1'
+	'ɑ Slack Bus 1λ'
 	'Slack \"Bus\" 1'
 	'Slack '''
 	''