Changeset: 65054a7d8b7e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65054a7d8b7e
Modified Files:
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst010.stable.err
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst120a.malC
monetdb5/mal/Tests/tst900.stable.err
Branch: malparsing
Log Message:
Approve output
diffs (110 lines):
diff --git a/monetdb5/mal/Tests/tst002.stable.err
b/monetdb5/mal/Tests/tst002.stable.err
--- a/monetdb5/mal/Tests/tst002.stable.err
+++ b/monetdb5/mal/Tests/tst002.stable.err
@@ -39,9 +39,9 @@ QUERY = # reserved names may not be used
b:= false;
exit barrier;
ERROR = !SyntaxException: true:= 23;
- !SyntaxException:^5 <identifier> expected
+ !SyntaxException:^5 simple left-hand-side <identifier> expected
!SyntaxException: false:= 24;
- !SyntaxException:^7 <identifier> expected
+ !SyntaxException:^7 simple left-hand-side <identifier> expected
# 22:10:35 >
# 22:10:35 > "Done."
diff --git a/monetdb5/mal/Tests/tst008.stable.err
b/monetdb5/mal/Tests/tst008.stable.err
--- a/monetdb5/mal/Tests/tst008.stable.err
+++ b/monetdb5/mal/Tests/tst008.stable.err
@@ -38,7 +38,7 @@ QUERY = function foo();
end foo;
ERROR = !SyntaxException: io.printi;
!SyntaxException:^10 '(' expected
- !TypeException:user.foo[2]:'io.printi' undefined in: io.printi();
+ !TypeException:user.foo[1]:'i' may not be used before being initialized
# 10:46:01 >
diff --git a/monetdb5/mal/Tests/tst010.stable.err
b/monetdb5/mal/Tests/tst010.stable.err
--- a/monetdb5/mal/Tests/tst010.stable.err
+++ b/monetdb5/mal/Tests/tst010.stable.err
@@ -69,19 +69,19 @@ QUERY = # syntax analysis test for guard
f:=1;
end;
end foo;
-ERROR = !SyntaxException:user.main[6]:label 'Z' not in guarded block
- !SyntaxException:user.main[10]:label 'L' not in guarded block
- !SyntaxException:user.main[12]:label 'X' not in guarded block
- !SyntaxException:user.main[14]:label 'A' not in guarded block
- !SyntaxException:user.main[17]:label 'L' not in guarded block
- !SyntaxException:user.main[20]:label 'L' not in guarded block
- !SyntaxException:user.main[30]:exit-label 'B' doesnot match 'A'
- !SyntaxException:user.main[32]:exit-label 'F' without begin-label
- !SyntaxException:user.main[42]:exit-label 'A' without begin-label
- !SyntaxException:parseError:end foo;
- !SyntaxException:parseError: ^non matching end label
+ERROR = !MALException:user.main[2]:label 'Z' not in guarded block
+ !MALException:user.main[1]:label 'L' not in guarded block
+ !MALException:user.main[1]:label 'X' not in guarded block
+ !MALException:user.main[1]:label 'A' not in guarded block
+ !MALException:user.main[2]:label 'L' not in guarded block
+ !MALException:user.main[4]:label 'L' not in guarded block
+ !MALException:user.main[8]:exit-label 'B' doesnot match 'A'
+ !MALException:user.main[1]:exit-label 'F' without begin-label
+ !MALException:user.main[1]:exit-label 'A' without begin-label
+ !SyntaxException: end foo;
+ !SyntaxException:^8 non matching end label
-# 10:57:17 >
-# 10:57:17 > "Done."
-# 10:57:17 >
+# 21:32:36 >
+# 21:32:36 > "Done."
+# 21:32:36 >
diff --git a/monetdb5/mal/Tests/tst013.stable.err
b/monetdb5/mal/Tests/tst013.stable.err
--- a/monetdb5/mal/Tests/tst013.stable.err
+++ b/monetdb5/mal/Tests/tst013.stable.err
@@ -46,8 +46,8 @@ QUERY = # incomplete barrier blocks. Res
exit t;
redo;
exit;
-ERROR = !SyntaxException:user.main[3]:label 'X_2' not in guarded block
- !SyntaxException:user.main[14]:label 't' not in guarded block
+ERROR = !MALException:user.main[2]:label 'X_1' not in guarded block
+ !MALException:user.main[8]:label 't' not in guarded block
# 13:20:00 >
# 13:20:00 > "Done."
diff --git a/monetdb5/mal/Tests/tst058.stable.err
b/monetdb5/mal/Tests/tst058.stable.err
--- a/monetdb5/mal/Tests/tst058.stable.err
+++ b/monetdb5/mal/Tests/tst058.stable.err
@@ -79,7 +79,7 @@ ERROR = !SyntaxException:-- some typos i
!SyntaxException:^0 convertConstant: integer parse
error!SyntaxException:-- some typos i:= 1 + 1 + 1;
!SyntaxException:-- some typos i:= 1 + 1 + 1;
!SyntaxException:^0 convertConstant: integer parse error
- !SyntaxException:user.main[2]:^29 <identifier> expected
+ !SyntaxException:user.main[2]:^29 simple left-hand-side <identifier>
expected
!SyntaxException: j:= 1 + + 1;
!SyntaxException:^9 <term> expected
diff --git a/monetdb5/mal/Tests/tst120a.malC b/monetdb5/mal/Tests/tst120a.malC
--- a/monetdb5/mal/Tests/tst120a.malC
+++ b/monetdb5/mal/Tests/tst120a.malC
@@ -1,5 +1,4 @@
module top;
function first(i:int):int; return first:= 0:int; end first;
-i:=first(1);
i:=top.first(1);
io.print(i);
diff --git a/monetdb5/mal/Tests/tst900.stable.err
b/monetdb5/mal/Tests/tst900.stable.err
--- a/monetdb5/mal/Tests/tst900.stable.err
+++ b/monetdb5/mal/Tests/tst900.stable.err
@@ -45,7 +45,6 @@ ERROR = !SyntaxException: d:= [+](b,c) ;
!SyntaxException:^5 <ident> or <operator> expected
!SyntaxException:a:= b [+] b;
!SyntaxException:^6 <ident> or <operator> expected
- !TypeException:user.foo[2]:'multiplex.+' undefined in: x:any :=
multiplex.+(b:bat[:lng], b:bat[:lng]);
# 12:36:20 >
# 12:36:20 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
