Move Int parsing to i32 for #543 (#700)

Note this doesn't support other sizes or types, it just errors on them.

Co-authored-by: Geoff Romer <[email protected]>

executable_semantics/ast/expression.cpp

@@ -271,7 +271,7 @@ void Expression::Print(llvm::raw_ostream& out) const {
       out << "Bool";
       break;
     case ExpressionKind::IntTypeLiteral:
-      out << "Int";
+      out << "i32";
       break;
     case ExpressionKind::TypeTypeLiteral:
       out << "Type";

executable_semantics/interpreter/value.cpp

@@ -192,7 +192,7 @@ void Value::Print(llvm::raw_ostream& out) const {
       out << "Bool";
       break;
     case Value::Kind::IntType:
-      out << "Int";
+      out << "i32";
       break;
     case Value::Kind::TypeType:
       out << "Type";

executable_semantics/syntax/lexer.lpp

@@ -8,6 +8,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #include <cstdlib>
 #include <iostream>
 
+#include "common/check.h"
 #include "executable_semantics/common/tracing_flag.h"
 #include "executable_semantics/syntax/parse_and_lex_context.h"
 #include "llvm/ADT/StringExtras.h"
@@ -45,7 +46,6 @@ FALSE             "false"
 FN                "fn"
 FNTY              "fnty"
 IF                "if"
-INT               "Int"
 MATCH             "match"
 NOT               "not"
 OR                "or"
@@ -62,6 +62,7 @@ AWAIT             "__await"
 UNDERSCORE        "_"
 
 identifier    [A-Za-z_][A-Za-z0-9_]*
+sized_type_literal [iuf][1-9][0-9]*
 integer_literal   [0-9]+
 horizontal_whitespace [ \t\r]
 whitespace [ \t\r\n]
@@ -106,7 +107,6 @@ operand_start [(A-Za-z0-9_"]
 {FN}       { return Carbon::Parser::make_FN(context.current_token_position); }
 {FNTY}     { return Carbon::Parser::make_FNTY(context.current_token_position); }
 {IF}       { return Carbon::Parser::make_IF(context.current_token_position); }
-{INT}      { return Carbon::Parser::make_INT(context.current_token_position); }
 {MATCH}    { return Carbon::Parser::make_MATCH(context.current_token_position); }
 {NOT}      { return Carbon::Parser::make_NOT(context.current_token_position); }
 {OR}       { return Carbon::Parser::make_OR(context.current_token_position); }
@@ -122,6 +122,8 @@ operand_start [(A-Za-z0-9_"]
 {AWAIT}    { return Carbon::Parser::make_AWAIT(context.current_token_position); }
 {UNDERSCORE}      { return Carbon::Parser::make_UNDERSCORE(context.current_token_position); }
 
+{sized_type_literal} { return Carbon::Parser::make_sized_type_literal(yytext, context.current_token_position); }
+
 "=" return Carbon::Parser::make_EQUAL(context.current_token_position);
 "-" return Carbon::Parser::make_MINUS(context.current_token_position);
 "+" return Carbon::Parser::make_PLUS(context.current_token_position);
@@ -183,8 +185,9 @@ operator and its operand, leading to three more cases:
 
 {integer_literal} {
   BEGIN(AFTER_OPERAND);
-  auto r = atof(yytext);
-  return Carbon::Parser::make_integer_literal(r, context.current_token_position);
+  int val;
+  CHECK(llvm::to_integer(yytext, val));
+  return Carbon::Parser::make_integer_literal(val, context.current_token_position);
 }
 
 {ONE_LINE_COMMENT} {

executable_semantics/syntax/parser.ypp

@@ -55,8 +55,10 @@
 #include <list>
 #include <vector>
 
+#include "common/check.h"
 #include "executable_semantics/syntax/syntax_helpers.h"
 #include "executable_semantics/syntax/parse_and_lex_context.h"
+#include "llvm/ADT/StringExtras.h"
 }  // %code top
 
 %code requires {
@@ -88,6 +90,7 @@ void Carbon::Parser::error(const location_type&, const std::string& message) {
 
 %token <int> integer_literal
 %token <std::string> identifier
+%token <std::string> sized_type_literal
 %type <std::string> designator
 %type <Declaration> declaration
 %type <FunctionDefinition> function_declaration
@@ -129,7 +132,6 @@ void Carbon::Parser::error(const location_type&, const std::string& message) {
 %token AND
 %token OR
 %token NOT
-%token INT
 %token BOOL
 %token TYPE
 %token FN
@@ -221,8 +223,13 @@ expression:
     { $$ = Expression::MakeBoolLiteral(yylineno, true); }
 | FALSE
     { $$ = Expression::MakeBoolLiteral(yylineno, false); }
-| INT
-    { $$ = Expression::MakeIntTypeLiteral(yylineno); }
+| sized_type_literal
+    {
+      int val;
+      CHECK(llvm::to_integer(llvm::StringRef($1).substr(1), val));
+      CHECK($1[0] == 'i' && val == 32)  << "Only i32 is supported for now: " << $1;
+      $$ = Expression::MakeIntTypeLiteral(yylineno);
+    }
 | BOOL
     { $$ = Expression::MakeBoolTypeLiteral(yylineno); }
 | TYPE

executable_semantics/testdata/assignment_copy1.carbon

@@ -4,10 +4,10 @@
 
 // Test that assignment performs a copy and does not create an alias.
 
-fn main() -> Int {
-  var x: Int = -1;
+fn main() -> i32 {
+  var x: i32 = -1;
   {
-     var y: Int = 0;
+     var y: i32 = 0;
      x = y;
      // y dies here
   }

executable_semantics/testdata/assignment_copy2.carbon

@@ -4,9 +4,9 @@
 
 // Test that assignment performs a copy and does not create an alias.
 
-fn main() -> Int {
-  var x: Int = 0;
-  var y: Int = x;
+fn main() -> i32 {
+  var x: i32 = 0;
+  var y: i32 = x;
   x = 1;
   return y;
 }

executable_semantics/testdata/block1.carbon

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   {
-    var x: Int = 1;
+    var x: i32 = 1;
   }
   return x;
 }

executable_semantics/testdata/block2.carbon

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   {
     // empty block
   }

executable_semantics/testdata/break1.carbon

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-fn main() -> Int {
-  var x: Int = 2;
+fn main() -> i32 {
+  var x: i32 = 2;
   while (true) {
     if (x == 0) {
       break;

executable_semantics/testdata/choice1.carbon

@@ -4,11 +4,11 @@
 
 choice Ints {
   None,
-  One(Int),
-  Two(Int,Int)
+  One(i32),
+  Two(i32,i32)
 }
 
-fn main() -> Int {
+fn main() -> i32 {
   var x: auto = Ints.None();
   var y: auto = Ints.One(42);
   var n: auto = 0;
@@ -34,6 +34,6 @@ fn main() -> Int {
 // Test some alternate syntaxes
 choice MoreInts {
   None(),
-  One(Int),
-  Two(Int,Int),
+  One(i32),
+  Two(i32,i32),
 }

executable_semantics/testdata/continue1.carbon

@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-fn main() -> Int {
+fn main() -> i32 {
   var x: auto = 2;
   while (not (x == 0)) {
     x = x - 1;

executable_semantics/testdata/experimental_continuation1.carbon

@@ -4,8 +4,8 @@
 
 // Test that creating a continuation doesn't do anything.
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   __continuation k {
     x = x + 1;
   }

executable_semantics/testdata/experimental_continuation2.carbon

@@ -4,8 +4,8 @@
 
 // Test creating and running a continuation.
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   __continuation k {
     x = x + 1;
   }

executable_semantics/testdata/experimental_continuation3.carbon

@@ -5,8 +5,8 @@
 // Test pausing a continuation with `__await` and restarting it with
 // `__run`.
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   __continuation k {
     x = x + 1;
     __await;

executable_semantics/testdata/experimental_continuation4.carbon

@@ -5,8 +5,8 @@
 // Assignment for continuations is shallow, so `k2` refers to the same
 // continuation as `k1`.
 
-fn main() -> Int {
-  var x: Int = 0;
+fn main() -> i32 {
+  var x: i32 = 0;
   __continuation k1 {
     x = x + 1;
     __await;

executable_semantics/testdata/experimental_continuation5.carbon

@@ -4,10 +4,10 @@
 
 // Test access to block-scoped variables upon resuming a continuation.
 
-fn main() -> Int {
-  var y: Int = 0;
+fn main() -> i32 {
+  var y: i32 = 0;
   __continuation k {
-    var x: Int = 0;
+    var x: i32 = 0;
     x = x + 1;
     __await;
     x = x + 2;

executable_semantics/testdata/experimental_continuation6.carbon

@@ -4,9 +4,9 @@
 
 // Test recursive functions inside continuations.
 
-var current: Int = 0;
+var current: i32 = 0;
 
-fn CountUpTo(x: Int) -> Int {
+fn CountUpTo(x: i32) -> i32 {
   if (x == 0) {
     current = 0;
     __await;
@@ -18,12 +18,12 @@ fn CountUpTo(x: Int) -> Int {
   }
 }
 
-fn main() -> Int {
+fn main() -> i32 {
   __continuation k {
     CountUpTo(5);
   }
-  var sum: Int = 0;
-  var count: Int = 5;
+  var sum: i32 = 0;
+  var count: i32 = 5;
   while (not (count == 0)) {
     __run k;
     sum = sum + current;

executable_semantics/testdata/experimental_continuation7.carbon

@@ -6,11 +6,11 @@
 // on the stack such as the variable `x`. In this example the copy
 // happens after the variable `x` is created.
 
-var y: Int = 0;
+var y: i32 = 0;
 
-fn main() -> Int {
+fn main() -> i32 {
   __continuation k1 {
-    var x: Int = 0;
+    var x: i32 = 0;
     x = x + 1;
     __await;
     x = x + 2;

executable_semantics/testdata/experimental_continuation8.carbon

@@ -7,11 +7,11 @@
 // happens before the variable `x` is created, so each continuation
 // creates a different `x`.
 
-var y: Int = 0;
+var y: i32 = 0;
 
-fn main() -> Int {
+fn main() -> i32 {
   __continuation k1 {
-    var x: Int = 0;
+    var x: i32 = 0;
     x = x + 1;
     __await;
     y = x;

executable_semantics/testdata/experimental_continuation9.carbon

@@ -7,14 +7,14 @@
 // is dangerous and can happen inside continuations.
 
 fn capture() -> __Continuation {
-  var x: Int = 1;
+  var x: i32 = 1;
   __continuation k {
-    var y: Int = x;
+    var y: i32 = x;
   }
   return k;
 }
 
-fn main() -> Int {
+fn main() -> i32 {
   var k: __Continuation = capture();
   __run k; // error, lifetime of x is over
   return 0;

executable_semantics/testdata/fun1.carbon

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-fn f(x: Int) -> Int {
+fn f(x: i32) -> i32 {
   return x - 1;
 }
 
-fn main() -> Int {
+fn main() -> i32 {
   return f(1);
 }

executable_semantics/testdata/fun2.carbon

@@ -6,12 +6,12 @@
 // This makes sure that when the value in `x` dies,
 // it does not cause the value in `a` to also die.
 
-fn f(x: Int) -> Int {
+fn f(x: i32) -> i32 {
   return 0;
 }
 
-fn main() -> Int {
-  var a: Int = 0; var b: Int = 1;
+fn main() -> i32 {
+  var a: i32 = 0; var b: i32 = 1;
   f(a);
   b = a;
   return b;

executable_semantics/testdata/fun3.carbon

@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // Test multiple arguments
-fn f(x: Int, y: Int) -> Int {
+fn f(x: i32, y: i32) -> i32 {
   return x + y;
 }
 
-fn main() -> Int {
+fn main() -> i32 {
   return f(2,3) - 5;
 }

executable_semantics/testdata/fun4.carbon

@@ -5,7 +5,7 @@
 // Test empty parameters and return type
 fn f() { }
 
-fn main() -> Int {
+fn main() -> i32 {
   f();
   return 0;
 }