Replace 'type(X)' with 'matching(X)' in the interpreter

Closes #5 GitHub issue (as far as the interpreter is concerned)

Note that the 'type' syntactic sugar is not implemented in this commit.

src/interpreter.cpp

@@ -757,9 +757,8 @@ Tree *Interpreter::Instructions(Context_p context, Tree_p what)
 
             if (Name *name = callee->AsName())
                 // A few cases where we don't interpret the result
-                if (name->value == "type"   ||
-                    name->value == "extern" ||
-                    name->value == "data")
+                if (name->value == "matching"   ||
+                    name->value == "extern")
                     return what;
 
             // This variable records if we evaluated the callee
@@ -1029,10 +1028,10 @@ Tree *Interpreter::TypeCheck(Scope *scope, Tree *type, Tree *value)
     }
     else
     {
-        // Check a type like 'type (X, Y)'
+        // Check a type like 'matching (X, Y)'
         if (Prefix *ptype = type->AsPrefix())
             if (Name *ptypename = ptype->left->AsName())
-                if (ptypename->value == "type")
+                if (ptypename->value == "matching")
                     return formTypeCheck(scope, ptype->right, value);
 
         record(interpreter_typecheck, "No code for %t, opcode is %O",

src/xl.syntax

@@ -28,6 +28,7 @@ INFIX
         600     :
 
 PREFIX
+        20      matching
         30      type class module function method procedure to operation
         30      data macro generic polymorphic iterator
         30      fast small global thread static

tests/02.Arithmetic/08-complex-add.xl

@@ -1,4 +1,4 @@
-complex is type((re:real, im:real))
+complex is matching((re:real, im:real))
 Z1:complex + Z2:complex as complex is (Z1.re + Z2.re, Z1.im + Z2.im)
 
 (3,4) + (5, 6)

tests/02.Arithmetic/08b-complex-add-with-prefix.ref

@@ -1 +1 @@
-type (complex (re:real, im:real)) (8.0, 10.0)
+matching (complex (re:real, im:real)) (8.0, 10.0)

tests/02.Arithmetic/08b-complex-add-with-prefix.xl

@@ -1,5 +1,5 @@
 // FILTER=sed -e 's/) )/))/g'
-complex is type(complex(re:real, im:real))
+complex is matching(complex(re:real, im:real))
 Z1:complex + Z2:complex as complex is complex(Z1.re + Z2.re, Z1.im + Z2.im)
 
 (complex(3,4) + complex(5, 6))

tests/02.Arithmetic/09-complex-arithmetic.xl

@@ -1,4 +1,4 @@
-complex is type(re:real, im:real)
+complex is matching(re:real, im:real)
 Z1:complex + Z2:complex is (Z1.re + Z2.re, Z1.im + Z2.im)
 Z1:complex + Z2:real    is (Z1.re + Z2, Z1.im)
 Z1:complex - Z2:complex is (Z1.re - Z2.re, Z1.im - Z2.im)
@@ -11,7 +11,7 @@ Z1:complex / Z2:complex is
     denom is Z2.re^2 + Z2.im^2
     numer / denom
 
-write Z:complex         is write "(", Z.re, ",", Z.im, ")"
+write Z:complex       is write "(", Z.re, ",", Z.im, ")"
 print T, C:complex    is print T, "(", C.re, ", ", C.im, ")"
 
 print "(3,4) + (5,6)=", (3,4) + (5,6)