Merge pull request #166 from faultyserver/native_primitives

Closes #165. Use native types for primitives.

spec/interpreter/callstack_spec.cr

@@ -81,8 +81,7 @@ describe "Interpreter - Callstack" do
     it "removes the last entry from the callstack" do
       itr = Interpreter.new
       add_breakpoint(itr, "breakpoint") do
-        expected_stack_size = __args[0].as(TInteger).value
-        itr.callstack.size.should eq(expected_stack_size)
+        itr.callstack.size.should eq(__args[0])
       end
 
       parse_and_interpret! %q(
@@ -100,8 +99,7 @@ describe "Interpreter - Callstack" do
       it "removes the last entry from the callstack" do
         itr = Interpreter.new
         add_breakpoint(itr, "breakpoint") do
-          expected_stack_size = __args[0].as(TInteger).value
-          itr.callstack.size.should eq(expected_stack_size)
+          itr.callstack.size.should eq(__args[0])
         end
 
         parse_and_interpret! %q(
@@ -121,8 +119,7 @@ describe "Interpreter - Callstack" do
     it "removes the `block` from the callstack" do
       itr = Interpreter.new
       add_breakpoint(itr, "breakpoint") do
-        expected_stack_size = __args[0].as(TInteger).value
-        itr.callstack.size.should eq(expected_stack_size)
+        itr.callstack.size.should eq(__args[0])
       end
 
       parse_and_interpret! %q(
@@ -137,8 +134,7 @@ describe "Interpreter - Callstack" do
     it "removes the `next` from the callstack" do
       itr = Interpreter.new
       add_breakpoint(itr, "breakpoint") do
-        expected_stack_size = __args[0].as(TInteger).value
-        itr.callstack.size.should eq(expected_stack_size)
+        itr.callstack.size.should eq(__args[0])
       end
 
       parse_and_interpret! %q(

spec/interpreter/closure_scope_spec.cr

@@ -9,7 +9,7 @@ describe "Interpreter - ClosureScope" do
       scope["b"]
     end
 
-    scope["b"]?.should be(nil)
+    scope["b"]?.should eq(nil)
   end
 
   describe "#[]" do
@@ -97,7 +97,7 @@ describe "Interpreter - ClosureScope" do
       scope = ClosureScope.new(Scope.new)
       scope["a"] = TNil.new
       scope["Thing"] = TType.new("Thing")
-      scope["x"] = TInteger.new(100_i64)
+      scope["x"] = 100_i64
 
       scope.values.size.should eq(3)
 

spec/interpreter/invocation_spec.cr

@@ -82,13 +82,13 @@ TYPE_DEFS = %q(
 )
 
 
-private def it_invokes(prelude, call, expected)
+private def it_invokes(prelude, call, expected, file=__FILE__, line=__LINE__, end_line=__END_LINE__)
   itr = parse_and_interpret(prelude)
   # Running the prelude will leave the last definition on the stack. For
   # clarity in the tests, the stack is cleared of any existing values before
   # making any assertions.
   itr.stack.clear
-  it_interprets(call, [expected] of Myst::Value, itr)
+  it_interprets(call, [expected] of MTValue, itr, file: file, line: line, end_line: end_line)
 end
 
 describe "Interpreter - Invocation" do

spec/interpreter/nodes/call_spec.cr

@@ -95,7 +95,7 @@ describe "Interpreter - Call" do
     # Operators can also be defined statically to do some type algebra.
     it_interprets %Q(
       deftype Foo
-        defstatic #{op}(other : Foo)
+        defstatic #{op}(other)
           :called_op_on_type
         end
       end

spec/interpreter/nodes/interpolation_spec.cr

@@ -17,11 +17,11 @@ describe "Interpreter - Interpolation" do
   it_interprets %q(<[1]>),         [TList.new([val(1)])]
   it_interprets %q(<[1, 2, 3]>),   [TList.new([val(1), val(2), val(3)])]
   it_interprets %q(<[nil, :hi]>),  [TList.new([val(nil), val(:hi)])]
-  it_interprets %q(<[[1, 2], [3, 4]]>), [TList.new([TList.new([val(1), val(2)]), TList.new([val(3), val(4)])] of Myst::Value)]
+  it_interprets %q(<[[1, 2], [3, 4]]>), [TList.new([TList.new([val(1), val(2)]), TList.new([val(3), val(4)])] of MTValue)]
 
   it_interprets %q(<{a: 1 }>),                    [TMap.new({ val(:a) => val(1) })]
   it_interprets %q(<{<1>: "int", <nil>: :nil }>), [TMap.new({ val(1) => val("int"), val(nil) => val(:nil) })]
-  it_interprets %q(<{<{a: 1}>: {b: 2}}>),         [TMap.new({ TMap.new({ val(:a) => val(1) }) => TMap.new({ val(:b) => val(2) }) } of Myst::Value => Myst::Value)]
+  it_interprets %q(<{<{a: 1}>: {b: 2}}>),         [TMap.new({ TMap.new({ val(:a) => val(1) }) => TMap.new({ val(:b) => val(2) }) } of MTValue => MTValue)]
 
   it_interprets %q(<(true   && true)>),   [val(true)]
   it_interprets %q(<(false  && true)>),   [val(false)]

spec/interpreter/nodes/literals_spec.cr

@@ -17,9 +17,9 @@ describe "Interpreter - Literals" do
   it_interprets %q([1]),         [TList.new([val(1)])]
   it_interprets %q([1, 2, 3]),   [TList.new([val(1), val(2), val(3)])]
   it_interprets %q([nil, :hi]),  [TList.new([val(nil), val(:hi)])]
-  it_interprets %q([[1, 2], [3, 4]]), [TList.new([TList.new([val(1), val(2)]), TList.new([val(3), val(4)])] of Myst::Value)]
+  it_interprets %q([[1, 2], [3, 4]]), [TList.new([TList.new([val(1), val(2)]), TList.new([val(3), val(4)])] of MTValue)]
 
   it_interprets %q({a: 1}),                     [TMap.new({ val(:a) => val(1) })]
   it_interprets %q({<1>: "int", <nil>: :nil}),  [TMap.new({ val(1) => val("int"), val(nil) => val(:nil) })]
-  it_interprets %q({<{a: 1}>: {b: 2}}),         [TMap.new({ TMap.new({ val(:a) => val(1) }) => TMap.new({ val(:b) => val(2) }) } of Myst::Value => Myst::Value)]
+  it_interprets %q({<{a: 1}>: {b: 2}}),         [TMap.new({ TMap.new({ val(:a) => val(1) }) => TMap.new({ val(:b) => val(2) }) } of MTValue => MTValue)]
 end

spec/interpreter/nodes/match_assign_spec.cr

@@ -3,15 +3,15 @@ require "../../support/nodes.cr"
 require "../../support/interpret.cr"
 
 private def it_matches(match, file=__FILE__, line=__LINE__, end_line=__END_LINE__)
-  it %Q(matches `#{match}`) do
+  it %Q(matches `#{match}`), file, line, end_line do
     itr = Interpreter.new
     program = parse_program(match)
     result = itr.run(program)
   end
 end
 
 private def it_does_not_match(match, file=__FILE__, line=__LINE__, end_line=__END_LINE__)
-  it %Q(does not match `#{match}`) do
+  it %Q(does not match `#{match}`), file, line, end_line do
     itr = Interpreter.new(errput: IO::Memory.new)
     program = parse_program(match)
 
@@ -50,7 +50,7 @@ describe "Interpreter - MatchAssign" do
   distinct_types.each_with_index do |a, i|
     distinct_types.each_with_index do |b, j|
       next if i == j
-      it_does_not_match "#{a} =: #{b}", /match/
+      it_does_not_match "#{a} =: #{b}"
     end
   end
 
@@ -59,8 +59,8 @@ describe "Interpreter - MatchAssign" do
   it_interprets %q(1    =: 1.0)
   it_interprets %q(1.0  =: 1)
 
-  it_does_not_match %q(1    =: 1.1),  /match/
-  it_does_not_match %q(1.1  =: 1),    /match/
+  it_does_not_match %q(1    =: 1.1)
+  it_does_not_match %q(1.1  =: 1)
 
 
   # Assignments at any level should either create or re-assign the variable
@@ -122,7 +122,7 @@ describe "Interpreter - MatchAssign" do
   it_does_not_match %q(
     A = false
     A =: true
-  ), /match/
+  )
 
   # Both styles of matching with Consts works through interpolation.
   it_interprets %q(<String>   =: "hello")
@@ -140,5 +140,5 @@ describe "Interpreter - MatchAssign" do
   it_does_not_match %q(
     float_type = 1.5.type
     <float_type> =: 1
-  ),  /match/
+  )
 end

spec/interpreter/scope_spec.cr

@@ -9,7 +9,7 @@ describe "Interpreter - Scope" do
       scope["b"]
     end
 
-    scope["b"]?.should be(nil)
+    scope["b"]?.should eq(nil)
   end
 
   describe "#[]" do
@@ -71,7 +71,7 @@ describe "Interpreter - Scope" do
       scope = Scope.new
       scope["a"] = TNil.new
       scope["Thing"] = TType.new("Thing")
-      scope["x"] = TInteger.new(100_i64)
+      scope["x"] = 100_i64
 
       scope.values.size.should eq(3)