Changeset: b2e541d67b2d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2e541d67b2d
Modified Files:
monetdb5/mal/Tests/dynamicload.stable.err
monetdb5/mal/Tests/parseErrors.stable.err
monetdb5/mal/Tests/pithole.stable.err
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst003.stable.err
monetdb5/mal/Tests/tst007.stable.err
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst019.stable.err
monetdb5/mal/Tests/tst027.stable.err
monetdb5/mal/Tests/tst036.stable.err
monetdb5/mal/Tests/tst036.stable.out
monetdb5/mal/Tests/tst038.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst071.stable.err
monetdb5/mal/Tests/tst071.stable.out
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst115.stable.err
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst161.stable.err
monetdb5/mal/Tests/tst163.stable.err
monetdb5/mal/Tests/tst303.stable.err
monetdb5/mal/Tests/tst305.stable.err
monetdb5/mal/Tests/tst611.stable.err
monetdb5/mal/Tests/tst660.stable.err
monetdb5/mal/Tests/tst755.stable.err
monetdb5/mal/Tests/tst760.stable.err
monetdb5/mal/Tests/tst802.stable.out
monetdb5/mal/Tests/tst804.stable.err
monetdb5/mal/Tests/tst830.stable.out
monetdb5/mal/Tests/tst850.stable.out
monetdb5/mal/Tests/tst870.stable.out
monetdb5/mal/Tests/tst900.stable.err
monetdb5/mal/Tests/tst903.stable.out
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline12.stable.out
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
monetdb5/optimizer/Tests/tst4006.stable.out
monetdb5/optimizer/Tests/tst4010.stable.out
Branch: malparsing
Log Message:
Approve output
The new error reporting affects the format of messages
diffs (truncated from 1051 to 300 lines):
diff --git a/monetdb5/mal/Tests/dynamicload.stable.err
b/monetdb5/mal/Tests/dynamicload.stable.err
--- a/monetdb5/mal/Tests/dynamicload.stable.err
+++ b/monetdb5/mal/Tests/dynamicload.stable.err
@@ -91,10 +91,12 @@ QUERY = # examples of non-bindable instr
comment "Should not be callable";
wrong();
-ERROR = !TypeException:user.main[3]:object code for command user.wrong missing
- !TypeException:user.main[3]:'user.wrong' undefined in:
user.wrong();
+ERROR = !SyntaxException:include UNKNOWlib;
+ !SyntaxException:^18 MALException:mal.import:#WARNING: could not open
file: UNKNOWlib
+ !TypeException:user.main[1]:object code for command user.wrong missing
+ !TypeException:user.main[1]:'user.wrong' undefined in:
user.wrong();
-# 13:26:24 >
-# 13:26:24 > "Done."
-# 13:26:24 >
+# 16:33:26 >
+# 16:33:26 > "Done."
+# 16:33:26 >
diff --git a/monetdb5/mal/Tests/parseErrors.stable.err
b/monetdb5/mal/Tests/parseErrors.stable.err
--- a/monetdb5/mal/Tests/parseErrors.stable.err
+++ b/monetdb5/mal/Tests/parseErrors.stable.err
@@ -16,10 +16,8 @@ MAPI = (monetdb) /var/tmp/mtest-13954/.
QUERY = K := :=
io.print(1);
io.print(2);
-ERROR = !SyntaxException:parseError:K := :=
- !SyntaxException:parseError: ^Type identifier expected
- !SyntaxException:parseError:K := :=
- !SyntaxException:parseError: ^';' expected
+ERROR = !SyntaxException:K := := io.print(1);
+ !SyntaxException:^6 Type identifier expected
# 21:00:37 >
# 21:00:37 > "Done."
diff --git a/monetdb5/mal/Tests/pithole.stable.err
b/monetdb5/mal/Tests/pithole.stable.err
--- a/monetdb5/mal/Tests/pithole.stable.err
+++ b/monetdb5/mal/Tests/pithole.stable.err
@@ -68,6 +68,9 @@ stderr of test 'pithole` in directory 'm
MAPI = (monetdb) /var/tmp/mtest-13954/.s.monetdb.38078
QUERY = #challenge the runtime stack protection
+ function user.main();
+ user.main();
+ end main;
user.main();
ERROR = !MALException:mal.interpreter:Recursive call limit reached.
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
@@ -38,10 +38,10 @@ QUERY = # reserved names may not be used
b:= true;
b:= false;
exit barrier;
-ERROR = !SyntaxException:parseError: true:= 23;
- !SyntaxException:parseError:^<identifier> expected
- !SyntaxException:parseError: false:= 24;
- !SyntaxException:parseError:^<identifier> expected
+ERROR = !SyntaxException: true:= 23;
+ !SyntaxException:^5 <identifier> expected
+ !SyntaxException: false:= 24;
+ !SyntaxException:^7 <identifier> expected
# 22:10:35 >
# 22:10:35 > "Done."
diff --git a/monetdb5/mal/Tests/tst003.stable.err
b/monetdb5/mal/Tests/tst003.stable.err
--- a/monetdb5/mal/Tests/tst003.stable.err
+++ b/monetdb5/mal/Tests/tst003.stable.err
@@ -38,7 +38,7 @@ QUERY = # test illegal variable use
b:=c; #c undefined
end foo;
ERROR = !TypeException:user.foo[1]:'b' may not be used before being initialized
- !TypeException:user.foo[3]:'c' may not be used before being initialized
+ !TypeException:user.foo[2]:'c' may not be used before being initialized
# 22:10:36 >
# 22:10:36 > "Done."
diff --git a/monetdb5/mal/Tests/tst007.stable.err
b/monetdb5/mal/Tests/tst007.stable.err
--- a/monetdb5/mal/Tests/tst007.stable.err
+++ b/monetdb5/mal/Tests/tst007.stable.err
@@ -80,7 +80,7 @@ QUERY = # A collection of forloops, whic
exit FS;
end foo;
-ERROR = !TypeException:user.foo[16]:'entry_or_exittest' may not be used before
being initialized
+ERROR = !TypeException:user.foo[11]:'entry_or_exittest' may not be used before
being initialized
# 13:48:22 >
# 13:48:22 > "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
@@ -36,8 +36,9 @@ QUERY = function foo();
io.printi;
io.print(i);
end foo;
-ERROR = !SyntaxException:parseError:io.printi;
- !SyntaxException:parseError: ^'(' expected
+ERROR = !SyntaxException: io.printi;
+ !SyntaxException:^10 '(' expected
+ !TypeException:user.foo[2]:'io.printi' undefined in: io.printi();
# 10:46:01 >
diff --git a/monetdb5/mal/Tests/tst019.stable.err
b/monetdb5/mal/Tests/tst019.stable.err
--- a/monetdb5/mal/Tests/tst019.stable.err
+++ b/monetdb5/mal/Tests/tst019.stable.err
@@ -77,9 +77,8 @@ QUERY = function welcome(lim:int):void;
(x,y):= user.welcome2(1);
ERROR = !TypeException:user.welcome[3]:type mismatch void := str
!TypeException:user.welcome0[3]:Multiple assignment mismatch
- !SyntaxException:user.welcome3[2]:invalid return target!
+ !MALException:user.welcome3[2]:invalid return target!
!TypeException:user.welcome4[2]:Multiple assignment mismatch
- !TypeException:user.main[5]:'user.welcome2' undefined in: (x:any,
y:str) := user.welcome2(1:int);
# 13:48:26 >
# 13:48:26 > "Done."
diff --git a/monetdb5/mal/Tests/tst027.stable.err
b/monetdb5/mal/Tests/tst027.stable.err
--- a/monetdb5/mal/Tests/tst027.stable.err
+++ b/monetdb5/mal/Tests/tst027.stable.err
@@ -38,7 +38,7 @@ QUERY = #variable arguments are only all
b:= bat.new(:int);
c:= bat.new(:int);
user.test("hello",b,c);
-ERROR = !TypeException:user.main[4]:'user.test' undefined in:
user.test("hello":str, b:bat[:int], c:bat[:int]);
+ERROR = !TypeException:user.main[1]:'user.test' undefined in:
user.test("hello":str, b:bat[:int], c:bat[:int]);
# 13:48:28 >
diff --git a/monetdb5/mal/Tests/tst036.stable.err
b/monetdb5/mal/Tests/tst036.stable.err
--- a/monetdb5/mal/Tests/tst036.stable.err
+++ b/monetdb5/mal/Tests/tst036.stable.err
@@ -82,7 +82,9 @@ QUERY = # test for proper use of list as
l1:= (1,2);
(l2,l3):= 3;
(l4,l5) := (4,5,6);
-ERROR = !TypeException:user.main[6]:Multiple assignment mismatch
+ERROR = !TypeException:user.main[1]:Multiple assignment mismatch
+ !TypeException:user.main[1]:Multiple assignment mismatch
+ !TypeException:user.main[1]:Multiple assignment mismatch
# 17:28:20 >
# 17:28:20 > Done.
diff --git a/monetdb5/mal/Tests/tst036.stable.out
b/monetdb5/mal/Tests/tst036.stable.out
--- a/monetdb5/mal/Tests/tst036.stable.out
+++ b/monetdb5/mal/Tests/tst036.stable.out
@@ -28,6 +28,8 @@ Ready.
# 11:38:05 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13830" "--port=32718"
# 11:38:05 >
+[ 1 ]
+[ "help" ]
# 11:38:05 >
# 11:38:05 > "Done."
diff --git a/monetdb5/mal/Tests/tst038.stable.err
b/monetdb5/mal/Tests/tst038.stable.err
--- a/monetdb5/mal/Tests/tst038.stable.err
+++ b/monetdb5/mal/Tests/tst038.stable.err
@@ -41,8 +41,6 @@ QUERY = #test the capability to deal wit
#The call to tst2 fails at runtime
user.tst2(b);
ERROR = !TypeException:user.tst2[1]:'bat.append' undefined in:
bat.append(b:bat[:int], "hello":str);
- !MALException:user.tst2[0]:Error in cloned function
- !TypeException:user.main[4]:'user.tst2' undefined in:
user.tst2(b:bat[:int]);
# 11:43:41 >
# 11:43:41 > "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
@@ -75,13 +75,13 @@ MAPI = (monetdb) /var/tmp/mtest-7831/.s
QUERY = -- some typos
i:= 1 + 1 + 1;
j:= 1 + + 1;
-ERROR = !SyntaxException:convertConstant:integer parse error
- !SyntaxException:parseError:-- some typos
- !SyntaxException:parseError:^<identifier> expected
- !SyntaxException:parseError:i:= 1 + 1 + 1;
- !SyntaxException:parseError: ^';' expected
- !SyntaxException:parseError:j:= 1 + + 1;
- !SyntaxException:parseError: ^<term> expected
+ERROR = !SyntaxException:-- some typos i:= 1 + 1 + 1;
+ !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: j:= 1 + + 1;
+ !SyntaxException:^9 <term> expected
# 20:18:21 >
# 20:18:21 > Done.
diff --git a/monetdb5/mal/Tests/tst071.stable.err
b/monetdb5/mal/Tests/tst071.stable.err
--- a/monetdb5/mal/Tests/tst071.stable.err
+++ b/monetdb5/mal/Tests/tst071.stable.err
@@ -42,7 +42,8 @@ QUERY = # parsing operations with multi-
io.print(y);
a:= user.swap(3,4);
io.print(a);
-ERROR = !TypeException:user.main[5]:'user.swap' undefined in: a:any :=
user.swap(3:int, 4:int);
+ERROR = !TypeException:user.main[1]:'user.swap' undefined in: a:any :=
user.swap(3:int, 4:int);
+ !TypeException:user.main[1]:'a' may not be used before being
initialized
# 13:48:42 >
diff --git a/monetdb5/mal/Tests/tst071.stable.out
b/monetdb5/mal/Tests/tst071.stable.out
--- a/monetdb5/mal/Tests/tst071.stable.out
+++ b/monetdb5/mal/Tests/tst071.stable.out
@@ -29,6 +29,8 @@ Ready.
# 13:48:42 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-24529" "--port=30912"
# 13:48:42 >
+[ 2 ]
+[ 1 ]
# 13:48:42 >
# 13:48:42 > "Done."
diff --git a/monetdb5/mal/Tests/tst102.stable.err
b/monetdb5/mal/Tests/tst102.stable.err
--- a/monetdb5/mal/Tests/tst102.stable.err
+++ b/monetdb5/mal/Tests/tst102.stable.err
@@ -37,7 +37,7 @@ QUERY = # the calls are wrong, they viol
a:=1+"hello";
b:=3.5+1;
-ERROR = !TypeException:user.main[3]:'calc.+' undefined in: a:any :=
calc.+(1:int, "hello":str);
+ERROR = !TypeException:user.main[1]:'calc.+' undefined in: a:any :=
calc.+(1:int, "hello":str);
diff --git a/monetdb5/mal/Tests/tst108.stable.err
b/monetdb5/mal/Tests/tst108.stable.err
--- a/monetdb5/mal/Tests/tst108.stable.err
+++ b/monetdb5/mal/Tests/tst108.stable.err
@@ -43,9 +43,9 @@ QUERY = # analyse the basic interpreter
redo t;
exit t;
i:= 0;
-ERROR = !SyntaxException:user.main[7]:exit-label 'v' doesnot match 't'
- !SyntaxException:user.main[9]:label 't' not in guarded block
- !SyntaxException:user.main[10]:exit-label 't' without begin-label
+ERROR = !MALException:user.main[5]:exit-label 'v' doesnot match 't'
+ !MALException:user.main[7]:label 't' not in guarded block
+ !MALException:user.main[8]:exit-label 't' without begin-label
# 20:43:15 >
# 20:43:15 > "Done."
diff --git a/monetdb5/mal/Tests/tst109.stable.err
b/monetdb5/mal/Tests/tst109.stable.err
--- a/monetdb5/mal/Tests/tst109.stable.err
+++ b/monetdb5/mal/Tests/tst109.stable.err
@@ -44,9 +44,9 @@ QUERY = # Error, illegal block weaveing
redo t;
exit t;
i:= 0;
-ERROR = !SyntaxException:user.main[9]:exit-label 'v' doesnot match 't'
- !SyntaxException:user.main[10]:label 't' not in guarded block
- !SyntaxException:user.main[11]:exit-label 't' without begin-label
+ERROR = !MALException:user.main[6]:exit-label 'v' doesnot match 't'
+ !MALException:user.main[7]:label 't' not in guarded block
+ !MALException:user.main[8]:exit-label 't' without begin-label
# 20:43:15 >
# 20:43:15 > "Done."
diff --git a/monetdb5/mal/Tests/tst115.stable.err
b/monetdb5/mal/Tests/tst115.stable.err
--- a/monetdb5/mal/Tests/tst115.stable.err
+++ b/monetdb5/mal/Tests/tst115.stable.err
@@ -52,7 +52,7 @@ QUERY = # the next step is to trace the
d:= user.doitTwice(3);
c:= 3;
d:= user.doitTwice("wrong");
-ERROR = !TypeException:user.main[7]:'user.doitTwice' undefined in: d:int
:= user.doitTwice("wrong":str);
+ERROR = !TypeException:user.main[1]:'user.doitTwice' undefined in: d:int
:= user.doitTwice("wrong":str);
# 13:20:26 >
# 13:20:26 > "Done."
diff --git a/monetdb5/mal/Tests/tst116.stable.err
b/monetdb5/mal/Tests/tst116.stable.err
--- a/monetdb5/mal/Tests/tst116.stable.err
+++ b/monetdb5/mal/Tests/tst116.stable.err
@@ -40,7 +40,7 @@ QUERY = # illustrate a short cut referen
Admin.doit("print(1);");
ERROR = !TypeException:user.doit[2]:'mal.call' undefined in:
mal.call(s:str);
- !TypeException:user.main[2]:'Admin.doit' undefined in:
Admin.doit("print(1);":str);
+ !TypeException:user.main[1]:'Admin.doit' undefined in:
Admin.doit("print(1);":str);
# 08:01:53 >
# 08:01:53 > "Done."
diff --git a/monetdb5/mal/Tests/tst161.stable.err
b/monetdb5/mal/Tests/tst161.stable.err
--- a/monetdb5/mal/Tests/tst161.stable.err
+++ b/monetdb5/mal/Tests/tst161.stable.err
@@ -42,7 +42,6 @@ QUERY = # testing definition of new atom
z:= mytype.l();
io.print(z);
ERROR = !SyntaxException:defConstant:constant coercion error from int to mytype
- !TypeException:user.main[2]:'mytype.l' undefined in: z:mytype :=
mytype.l();
# 13:20:34 >
# 13:20:34 > "Done."
diff --git a/monetdb5/mal/Tests/tst163.stable.err
b/monetdb5/mal/Tests/tst163.stable.err
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
