Mercurial > projects > dang

changeset 12:6282db07115f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added some ekstra tests, and allowed bool as a type
author Anders Halager <halager@gmail.com>
date Fri, 18 Apr 2008 13:58:27 +0200
parents 642c6a998fd9
children e5caf9971207
files lexer/Keyword.d parser/Parser.d tests/code/bool_1.d tests/code/bool_2.d tests/code/if_3.d tests/code/while_1.d tests/code/while_2.d
diffstat 7 files changed, 48 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lexer/Keyword.d	Fri Apr 18 13:45:39 2008 +0200
+++ b/lexer/Keyword.d	Fri Apr 18 13:58:27 2008 +0200
@@ -17,6 +17,8 @@
         "long"      : Tok.Long,
         "ulong"     : Tok.Ulong,
 
+        "bool"      : Tok.Bool,
+
         "float"     : Tok.Float,
         "double"    : Tok.Double,
 
--- a/parser/Parser.d	Fri Apr 18 13:45:39 2008 +0200
+++ b/parser/Parser.d	Fri Apr 18 13:58:27 2008 +0200
@@ -40,6 +40,7 @@
                  Tok.Int,   Tok.Uint,
                  Tok.Long,  Tok.Ulong,
                  Tok.Float, Tok.Double,
+                 Tok.Bool,
                  Tok.Identifier:
                 Identifier type = new Identifier(t);
 
@@ -205,6 +206,7 @@
                  Tok.Int,   Tok.Uint,
                  Tok.Long,  Tok.Ulong,
                  Tok.Float, Tok.Double,
+                 Tok.Bool,
                  Tok.Identifier:
                 return new Identifier(type);
                 break;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/code/bool_1.d	Fri Apr 18 13:58:27 2008 +0200
@@ -0,0 +1,6 @@
+int main()
+{
+    bool b = 1 < 2;
+    return b;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/code/bool_2.d	Fri Apr 18 13:58:27 2008 +0200
@@ -0,0 +1,5 @@
+int main()
+{
+    return 42 == 42;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/code/if_3.d	Fri Apr 18 13:58:27 2008 +0200
@@ -0,0 +1,11 @@
+int main()
+{
+    int x = 0;
+    int y = 1;
+    if (x)
+        return 1;
+    else if (y == 2)
+        return 1;
+    return 0;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/code/while_1.d	Fri Apr 18 13:58:27 2008 +0200
@@ -0,0 +1,8 @@
+int main()
+{
+    int x = 10;
+    while (x > 0)
+        x = x - 1;
+    return x;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/code/while_2.d	Fri Apr 18 13:58:27 2008 +0200
@@ -0,0 +1,14 @@
+int main()
+{
+    int x = 10;
+    int res = 0;
+    while (x > 0)
+    {
+        res = res + x;
+        x = x - 1;
+    }
+    if (res == 55)
+        return 0;
+    return 1;
+}
+