Better runtime type checks.

frog/parser.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // TODO(jimhug): Error recovery needs major work!
 /**
  * A simple recursive descent parser for the dart language.
  *
  * This parser is designed to be more permissive than the official
  * Dart grammar.  It is expected that many grammar errors would be
@@ skipping 927 matching lines @@
 
   /** Checks if the given expression is a binary op of the given kind. */
   _isBin(expr, kind) {
     return expr is BinaryExpression && expr.op.kind == kind;
   }
 
   _boolTypeRef(SourceSpan span) {
     return new TypeReference(span, world.boolType);
   }
 
-  _numTypeRef(SourceSpan span) {
-    return new TypeReference(span, world.numType);
+  _intTypeRef(SourceSpan span) {
+    return new TypeReference(span, world.intType);
+  }
+
+  _doubleTypeRef(SourceSpan span) {
+    return new TypeReference(span, world.doubleType);
   }
 
   _stringTypeRef(SourceSpan span) {
     return new TypeReference(span, world.stringType);
   }
 
   primary() {
     int start = _peekToken.start;
     switch (_peek()) {
       case TokenKind.THIS:
@@ skipping 38 matching lines @@
       case TokenKind.TRUE:
         _eat(TokenKind.TRUE);
         return new LiteralExpression(true, _boolTypeRef(_makeSpan(start)),
           'true', _makeSpan(start));
 
       case TokenKind.FALSE:
         _eat(TokenKind.FALSE);
         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.NUMBER:
+      case TokenKind.INTEGER:
+        var t = _next();
+        return new LiteralExpression(Math.parseInt(t.text),
+          _intTypeRef(_makeSpan(start)), t.text, _makeSpan(start));
+
+      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();
 
       case TokenKind.INCOMPLETE_STRING:
         return stringInterpolation();
 
       case TokenKind.LT:
         return finishTypedLiteral(start, false);
 
@@ skipping 608 matching lines @@
   /** Converts an expression into a label. */
   _makeLabel(expr) {
     if (expr is VarExpression) {
       return expr.name;
     } else {
       _errorExpected('label');
       return null;
     }
   }
 }