add float support hax

CS4215-OOGA · Apr 4, 2024 · 0ed2f09 · 0ed2f09
1 parent 25390fd
commit 0ed2f09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/parser/ooga.pegjs b/src/parser/ooga.pegjs
@@ -79,6 +79,8 @@ InitType
       switch(type[0]) {
         case "int":
           return "Integer";
+        case "float":
+          return "Integer";
         case "bool":
           return "Boolean";
         case "string":
@@ -148,7 +150,10 @@ NumericLiteral "number"
     }
 
 DecimalLiteral
-  = DecimalIntegerLiteral {
+  = DecimalIntegerLiteral "." DecimalDigit* {
+      return { tag: "Integer", value: parseFloat(text()) };
+    }
+  / DecimalIntegerLiteral {
       return { tag: "Integer", value: parseFloat(text()) };
     }
 
@@ -226,7 +231,7 @@ ReturnToken     = "return"     !IdentifierPart
 ThisToken       = "this"       !IdentifierPart
 TrueToken       = "true"       !IdentifierPart
 VarToken        = "var"        !IdentifierPart
-IntegerToken    = "int"        !IdentifierPart
+IntegerToken    = "int"/"float"        !IdentifierPart
 BooleanToken    = "bool"       !IdentifierPart
 StringToken     = "string"     !IdentifierPart
 GoroutineToken  = "go"         !IdentifierPart

diff --git a/src/vm/oogavm-typechecker.ts b/src/vm/oogavm-typechecker.ts
@@ -14,7 +14,7 @@ const types = {
 const StructTable = {};
 
 function is_integer(x) {
-    return typeof x === 'number' && x % 1 === 0;
+    return typeof x === 'number';
 }
 
 function is_boolean(x) {