fix: token file output

eddiecorrigall · Jun 19, 2024 · 60e8f45 · 60e8f45
1 parent 2cb5939
commit 60e8f45
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 38 deletions.
diff --git a/out/artifacts/jungle_jar/jungle.jar b/out/artifacts/jungle_jar/jungle.jar
diff --git a/programs/loop.ast b/programs/loop.ast
@@ -1,27 +1,35 @@
 SEQUENCE
-  ASSIGN
-    IDENTIFIER	i
-    LITERAL_INTEGER	3
   SEQUENCE
+    SEQUENCE
+      ASSIGN
+        IDENTIFIER	i
+        LITERAL_INTEGER	3
+      ;
     LOOP
-      OPERATOR_LESS_THAN
-        LITERAL_INTEGER	0
+      OPERATOR_GREATER_THAN
         IDENTIFIER	i
+        LITERAL_INTEGER	0
       BLOCK
         SEQUENCE
           SEQUENCE
-            PRINT
-              IDENTIFIER	i
-              ;
-            PRINT
-              LITERAL_STRING	\n
+            SEQUENCE
+              SEQUENCE
+                PRINT
+                  IDENTIFIER	i
+                  ;
+                ;
+              PRINT
+                LITERAL_STRING	...\n
+                ;
+            SLEEP
+              LITERAL_INTEGER	1000
               ;
           ASSIGN
             IDENTIFIER	i
             OPERATOR_SUBTRACT
               IDENTIFIER	i
               LITERAL_INTEGER	1
         ;
-    PRINT
-      LITERAL_STRING	Blast off!\n
-      ;
+  PRINT
+    LITERAL_STRING	Blast off!\n
+    ;
diff --git a/programs/loop.source b/programs/loop.source
@@ -1,7 +1,7 @@
 i = 3
 loop (greaterThan i 0) {
   print(i)
-  print('\n')
+  print('...\n')
   sleep 1000
   i = - i 1
 }

diff --git a/programs/loop.tokens b/programs/loop.tokens
@@ -27,26 +27,32 @@
 4	2	SPACE
 4	3	KEYWORD	print
 4	8	BRACKET_ROUND_OPEN
-4	9	TEXT	\\n
-4	13	BRACKET_ROUND_CLOSE
-4	14	NEWLINE
+4	9	TEXT	...\\n
+4	16	BRACKET_ROUND_CLOSE
+4	17	NEWLINE
 5	1	SPACE
 5	2	SPACE
-5	3	SYMBOL	i
-5	4	SPACE
-5	5	EQUALS
-5	6	SPACE
-5	7	MINUS
+5	3	KEYWORD	sleep
 5	8	SPACE
-5	9	SYMBOL	i
-5	10	SPACE
-5	11	NUMBER	1
-5	12	NEWLINE
-6	1	BRACKET_CURLY_CLOSE
-6	2	NEWLINE
-7	1	KEYWORD	print
-7	6	BRACKET_ROUND_OPEN
-7	7	TEXT	Blast off!\\n
-7	21	BRACKET_ROUND_CLOSE
-7	22	NEWLINE
-7	23	TERMINAL
+5	9	NUMBER	1000
+5	13	NEWLINE
+6	1	SPACE
+6	2	SPACE
+6	3	SYMBOL	i
+6	4	SPACE
+6	5	EQUALS
+6	6	SPACE
+6	7	MINUS
+6	8	SPACE
+6	9	SYMBOL	i
+6	10	SPACE
+6	11	NUMBER	1
+6	12	NEWLINE
+7	1	BRACKET_CURLY_CLOSE
+7	2	NEWLINE
+8	1	KEYWORD	print
+8	6	BRACKET_ROUND_OPEN
+8	7	TEXT	Blast off!\\n
+8	21	BRACKET_ROUND_CLOSE
+8	22	NEWLINE
+8	23	TERMINAL
diff --git a/src/main/java/com/jungle/ast/Node.java b/src/main/java/com/jungle/ast/Node.java
@@ -1,5 +1,6 @@
 package com.jungle.ast;
 
+import com.jungle.common.StringUtils;
 import com.jungle.error.LoadError;
 import com.jungle.error.SaveError;
 import com.jungle.logger.FileLogger;
@@ -103,7 +104,7 @@ public String getStringValue() {
     if (getRawValue() == null) {
       throw new Error("failed to parse value as string - value is null");
     }
-    return getRawValue();
+    return StringUtils.unescapeString(getRawValue());
   }
 
   // endregion

diff --git a/src/main/java/com/jungle/parser/Parser.java b/src/main/java/com/jungle/parser/Parser.java
@@ -167,9 +167,8 @@ public INode parseTextLiteral() {
     if (textValue == null) {
       throw newError("text token missing value");
     }
-    textValue = StringUtils.unescapeString(textValue);
     // Note: a character literal cannot be empty, but a string literal can be empty
-    boolean isSingleCharacter = textValue.length() == 1;
+    boolean isSingleCharacter = StringUtils.unescapeString(textValue).length() == 1;
     NodeType type = isSingleCharacter
             ? NodeType.LITERAL_CHARACTER
             : NodeType.LITERAL_STRING;

diff --git a/src/test/java/com/jungle/parser/ParserTest.java b/src/test/java/com/jungle/parser/ParserTest.java
@@ -527,7 +527,9 @@ public void testParseTextLiteral_singleCharacterEscaped() {
 
     assertNotNull(ast);
     assertEquals(NodeType.LITERAL_CHARACTER, ast.getType());
-    assertEquals("\n", ast.getRawValue());
+    assertEquals("\\n", ast.getRawValue());
+    assertEquals("\n", ast.getStringValue());
+    assertEquals(new Character('\n'), ast.getCharacterValue());
   }
 
   @Test