Mercurial > projects > dang

changeset 157:bb01c1dc452a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge commit
author Anders Johnsen <skabet@gmail.com>
date Mon, 21 Jul 2008 22:14:06 +0200
parents 2149f4a7b48d (current diff) 2c5a8061aa4a (diff)
children 57b0b4464a0b
files
diffstat 5 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/code/switch_1.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_1.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
     }
--- a/tests/code/switch_2.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_2.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
         case 1:
--- a/tests/code/switch_3.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_3.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
         case 1, 2:
--- a/tests/code/switch_4.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_4.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-int main(int x)
+int main()
 {
+    int x;
     switch (x)
     {
         case 1, 2:
--- a/tests/parser/class_2.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/parser/class_2.d	Mon Jul 21 22:14:06 2008 +0200
@@ -4,12 +4,12 @@
     int a;
 }
 
-class B
+class B : A
 {
     int b;
 }
 
-class C : A, B
+class C : B
 {
     int c;
 }