Remove brackets from the typeof and default operators.

impworks · Mar 3, 2013 · 7853628 · 7853628
1 parent 9c415f3
commit 7853628
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Lens.Parser/Grammar.fs b/Lens.Parser/Grammar.fs
@@ -281,7 +281,7 @@ value_exprRef         := choice [attempt lvalue      |>> Node.getterNode
                                  attempt atomar_expr]
 type_operator_exprRef := pipe2
                          <| (keyword "typeof" <|> keyword "default")
-                         <| (token "(" >>? ``type`` .>>? token ")")
+                         <| ``type``
                          <| Node.typeOperator
 literalRef            := choice [attempt <| token "()"                         |>> Node.unit
                                  attempt <| keyword "null"                     |>> Node.nullNode

diff --git a/Lens.Test/OperatorsTest.cs b/Lens.Test/OperatorsTest.cs
@@ -12,24 +12,24 @@ public class OperatorsTest
 		[Test]
 		public void TypeofTest()
 		{
-			TestType<int>("typeof(int)");
-			TestType<float>("typeof(float)");
-			TestType<object>("typeof(object)");
+			TestType<int>("typeof int");
+			TestType<float>("typeof float");
+			TestType<object>("typeof object");
 
-			TestType<Dictionary<int, Exception>>("typeof(Dictionary<int, System.Exception>)");
+			TestType<Dictionary<int, Exception>>("typeof Dictionary<int, System.Exception>");
 		}
 
 		[Test]
 		public void DefaultTest()
 		{
-			Test("default(int)", 0);
-			Test("default(float)", 0.0f);
-			Test("default(long)", 0L);
-			Test("default(bool)", false);
+			Test("default int", 0);
+			Test("default float", 0.0f);
+			Test("default long", 0L);
+			Test("default bool", false);
 
-			Test("default(string)", null);
+			Test("default string", null);
 
-			Test("default(Nullable<int>)", default(int?));
+			Test("default Nullable<int>", default(int?));
 		}
 
 		[Test]

diff --git a/Lens.Test/ParserTest.cs b/Lens.Test/ParserTest.cs
@@ -627,15 +627,15 @@ log ex
 		[Test]
 		public void Typeof()
 		{
-			var src = "let a = typeof(int)";
+			var src = "let a = typeof int";
 			var result = Expr.Let("a", Expr.Typeof("int"));
 			Test(src, result);
 		}
 
 		[Test]
 		public void DefaultOf()
 		{
-			var src = "let b = default (System.Collections.Generic.List<int>)";
+			var src = "let b = default System.Collections.Generic.List<int>";
 			var result = Expr.Let("b", Expr.Default("System.Collections.Generic.List<int>"));
 			Test(src, result);
 		}