Better runtime type checks.

frog/parser.dart

Index: frog/parser.dart
diff --git a/frog/parser.dart b/frog/parser.dart
index e77e28aba75f3962f4d6b92e2f056ee786e428e1..dfe8f7aea87ef2f00f3ed0b1c9fe921ebcc6a58b 100644
--- a/frog/parser.dart
+++ b/frog/parser.dart
@@ -945,8 +945,12 @@ class Parser {
     return new TypeReference(span, world.boolType);
   }
 
-  _numTypeRef(SourceSpan span) {
-    return new TypeReference(span, world.numType);
+  _intTypeRef(SourceSpan span) {

[Jennifer Messerly, 2011/11/05 00:45:11]

I started trying to make sense of ints vs doubles, but after fixing the parser
side I discovered a lot more issues. For now, there's a TODO in Value.convertTo
that ignores the distinction. It's not too far from working--but we need to
remove the various TODOs throughout the codebase that treat all nums the same.

+    return new TypeReference(span, world.intType);
+  }
+
+  _doubleTypeRef(SourceSpan span) {
+    return new TypeReference(span, world.doubleType);
   }
 
   _stringTypeRef(SourceSpan span) {
@@ -1005,16 +1009,21 @@ class Parser {
         return new LiteralExpression(false,_boolTypeRef(_makeSpan(start)),
           'false', _makeSpan(start));
 
-      case TokenKind.HEX_NUMBER:
+      case TokenKind.HEX_INTEGER:
         var t = _next();
         // Remove the 0x or 0X before parsing the hex number.
         return new LiteralExpression(parseHex(t.text.substring(2)),
-          _numTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
+          _intTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
+
+      case TokenKind.INTEGER:
+        var t = _next();
+        return new LiteralExpression(Math.parseInt(t.text),
+          _intTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
 
-      case TokenKind.NUMBER:
+      case TokenKind.DOUBLE:
         var t = _next();
         return new LiteralExpression(Math.parseDouble(t.text),
-          _numTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
+          _doubleTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
 
       case TokenKind.STRING:
         return stringLiteralExpr();