Fixed #55

gaborsch · Apr 26, 2024 · d7f3ef8 · d7f3ef8
1 parent 300b2d6
commit d7f3ef8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/programs/tests/fixtures/comments/dots.rock b/programs/tests/fixtures/comments/dots.rock
@@ -4,4 +4,7 @@ Burn it. (your_love = charFromCode⟨your_love⟩, i.e. space)
 Your heart is a poison, (your_heart = the base for casting)
 
 say your love,.:;
-say your heart.
+say your heart.
+
+shout ";("
+shout "what",,,.,.,., (?)
diff --git a/programs/tests/fixtures/comments/dots.rock.out b/programs/tests/fixtures/comments/dots.rock.out
@@ -1,2 +1,4 @@
 
 16
+;(
+what
diff --git a/rocky.jar b/rocky.jar
diff --git a/src/rockstar/parser/MultilineReader.java b/src/rockstar/parser/MultilineReader.java
@@ -64,6 +64,10 @@ public Line readLine() throws IOException {
                 break;
             }
         }
+        while (!tokens.isEmpty() 
+        		&& tokens.get(tokens.size()-1).getValue().equals(",")) {
+        	tokens.remove(tokens.size()-1);
+        }
         return new Line(origLine.toString(), filename, startLnum, tokens);
     }
 
@@ -73,7 +77,6 @@ private String readBuffer() throws IOException {
         if (l != null) {
             origLine.append(l);
             lnum++;
-            l = l.replaceAll("[ .,;:!]+$", "").replaceAll("[ .,;:!]+\\(", " (");
         }
         return l;
     }
@@ -123,6 +126,9 @@ private void processChar(char c) {
                         startToken();
                         break;
                     case ' ':
+                    case ';':
+                    case ':':
+                    case '!':
                     case '\t':
                     case '\n':
                     case '\r':
@@ -138,7 +144,7 @@ private void processChar(char c) {
                 }
             }
         } else {
-            if (" \t\r\n".indexOf(c) >= 0) {
+            if (" .;:!\t\r\n".indexOf(c) >= 0) {
                 // terminal char
                 addToken(0);
             } else if(",+-*/&".indexOf(c) >= 0) {
@@ -187,12 +193,18 @@ private void addToken(int offset) {
                     }
                 }
             }
+            if (isInNumber && token.equals(".")) {
+            	// a single dot is not a decimal number
+            	skipThisToken = true;
+            }
             if (! token.startsWith("\"")) {
+            	// apos does not count in a non-string token
                 token = token.replaceAll("[']*", "");
             }
             if (token.equalsIgnoreCase("and") 
                     && !tokens.isEmpty()
                     && ",".equals(tokens.get(tokens.size()-1).getValue())) {
+            	// in case of ", and", the comma is skipped  
                 skipThisToken = true;
             }
             if (! skipThisToken) {