Changeset: 16d17fec8c54 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16d17fec8c54
Modified Files:
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/mal/Tests/parseErrors.stable.err
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst036.stable.err
monetdb5/mal/Tests/tst038.stable.err
monetdb5/mal/Tests/tst054.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst070.stable.err
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst161.stable.err
monetdb5/mal/Tests/tst163.stable.err
monetdb5/mal/Tests/tst302.stable.err
monetdb5/mal/Tests/tst303.stable.err
monetdb5/mal/Tests/tst755.stable.err
monetdb5/mal/Tests/tst760.stable.err
monetdb5/mal/Tests/tst900.stable.err
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_atom.h
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_function.c
monetdb5/mal/mal_function.h
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_module.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_parser.h
monetdb5/mal/mal_private.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_resolve.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
monetdb5/mal/mal_stack.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_json.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_oltp.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_reduce.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_volcano.c
monetdb5/optimizer/opt_wlc.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.c
monetdb5/scheduler/run_adder.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/wlr.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: malerrors
Log Message:
Intermittent commit with default
diffs (truncated from 7262 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
b/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
--- a/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
+++ b/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
@@ -276,7 +276,7 @@ str OPTsql_append(Client cntxt, MalBlkPt
modnme= getArgDefault(mb,p,1);
fcnnme= getArgDefault(mb,p,2);
}
- s= findSymbol(cntxt->nspace, putName(modnme),putName(fcnnme));
+ s= findSymbol(cntxt->usermodule,
putName(modnme),putName(fcnnme));
if( s == NULL) {
char buf[1024];
@@ -294,9 +294,9 @@ str OPTsql_append(Client cntxt, MalBlkPt
actions= OPTsql_appendImplementation(cntxt, mb,stk,p);
/* Defense line against incorrect plans */
- chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
- chkFlow(cntxt->fdout, mb);
- chkDeclarations(cntxt->fdout, mb);
+ chkTypes(cntxt->usermodule, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
#ifdef DEBUG_OPT_OPTIMIZERS
mnstr_printf(cntxt->fdout,"=FINISHED sql_append %d\n",actions);
printFunction(cntxt->fdout,mb,0,LIST_MAL_ALL );
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,10 @@ 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:parseError:parseError:K := :=
+ !SyntaxException:parseError:parseError: ^Type identifier expected
+ !SyntaxException:parseError:parseError:K := :=
+ !SyntaxException:parseError:parseError: ^';' expected
# 21:00:37 >
# 21:00:37 > "Done."
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:parseError:parseError: true:= 23;
+ !SyntaxException:parseError:parseError: ^<identifier> expected
+ !SyntaxException:parseError:parseError: false:= 24;
+ !SyntaxException:parseError:parseError: ^<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
@@ -36,8 +36,8 @@ QUERY = function foo();
io.printi;
io.print(i);
end foo;
-ERROR = !SyntaxException:parseError:io.printi;
- !SyntaxException:parseError: ^'(' expected
+ERROR = !SyntaxException:parseError:parseError:io.printi;
+ !SyntaxException:parseError:parseError: ^'(' expected
# 10:46:01 >
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[3]:label 'X_2' not in guarded block
+ !MALException:user.main[14]:label 't' not in guarded block
# 13:20:00 >
# 13:20:00 > "Done."
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
@@ -83,6 +83,8 @@ QUERY = # test for proper use of list as
(l2,l3):= 3;
(l4,l5) := (4,5,6);
ERROR = !TypeException:user.main[6]:Multiple assignment mismatch
+ !TypeException:user.main[7]:Multiple assignment mismatch
+ !TypeException:user.main[8]:Multiple assignment mismatch
# 17:28:20 >
# 17:28:20 > 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,7 +41,7 @@ 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[0]:Error in cloned function
!TypeException:user.main[4]:'user.tst2' undefined in:
user.tst2(b:bat[:int]);
# 11:43:41 >
diff --git a/monetdb5/mal/Tests/tst054.stable.err
b/monetdb5/mal/Tests/tst054.stable.err
--- a/monetdb5/mal/Tests/tst054.stable.err
+++ b/monetdb5/mal/Tests/tst054.stable.err
@@ -76,8 +76,8 @@ QUERY = function z()( :int,:int,:int,:in
return (1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0);
end z;
z();
-ERROR = !SyntaxException:parseError:return
(1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0);
- !SyntaxException:parseError: ^<identifier> expected
+ERROR = !SyntaxException:parseError:parseError:return
(1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0);
+ !SyntaxException:parseError:parseError: ^<identifier> expected
!TypeException:user.main[1]:'user.z' undefined in: user.z();
# 11:11:08 >
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,15 @@ 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:parseError:parseError:-- some typos
+ !SyntaxException:parseError:parseError:^convertConstant: integer parse
error
+ !SyntaxException:parseError:parseError:i:= 1 + 1 + 1;
+ !SyntaxException:parseError:parseError:^<identifier> expected
+ !SyntaxException:parseError:parseError:i:= 1 + 1 + 1;
+ !SyntaxException:parseError:parseError: ^';' expected
+ !SyntaxException:parseError:parseError:j:= 1 + + 1;
+ !SyntaxException:parseError:parseError: ^<term> expected
+ !TypeException:user.main[3]:'calc.+' undefined in: j:any :=
calc.+(1:int);
# 20:18:21 >
# 20:18:21 > Done.
diff --git a/monetdb5/mal/Tests/tst070.stable.err
b/monetdb5/mal/Tests/tst070.stable.err
--- a/monetdb5/mal/Tests/tst070.stable.err
+++ b/monetdb5/mal/Tests/tst070.stable.err
@@ -38,6 +38,7 @@ QUERY = # parsing operations with multi-
(initial:str,surname:str):= user.getName();
end foo;
ERROR = !TypeException:user.foo[1]:'user.point' undefined in: (x:any,
y:any) := user.point(1:int);
+ !TypeException:user.foo[2]:'user.getName' undefined in:
(initial:str, surname:str) := user.getName();
# 13:02:34 >
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[7]:exit-label 'v' doesnot match 't'
+ !MALException:user.main[9]:label 't' not in guarded block
+ !MALException:user.main[10]: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[9]:exit-label 'v' doesnot match 't'
+ !MALException:user.main[10]:label 't' not in guarded block
+ !MALException:user.main[11]:exit-label 't' without begin-label
# 20:43:15 >
# 20:43:15 > "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,6 @@ 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);
# 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
@@ -41,8 +41,7 @@ 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();
+ERROR = !TypeException:mytype.l[0]:constant coercion error from int to mytype
# 13:20:34 >
# 13:20:34 > "Done."
diff --git a/monetdb5/mal/Tests/tst163.stable.err
b/monetdb5/mal/Tests/tst163.stable.err
--- a/monetdb5/mal/Tests/tst163.stable.err
+++ b/monetdb5/mal/Tests/tst163.stable.err
@@ -20,8 +20,10 @@ QUERY = #multiple atomary types
j:= i+3;
io.print(i);
io.print(j);
-ERROR = !TypeException:atomDefinition:Redefinition of atom 'myint'
- !TypeException:user.main[3]:'calc.+' undefined in: j:any :=
calc.+(i:myint, 3:int);
+ERROR = !SyntaxException:parseError:parseError:atom myint:int;
+ !SyntaxException:parseError:parseError: ^Atom redefinition
+ !SyntaxException:parseError:parseError:i:= 1:myint;
+ !SyntaxException:parseError:parseError:^';' expected
# 15:19:56 >
# 15:19:56 > "Done."
diff --git a/monetdb5/mal/Tests/tst302.stable.err
b/monetdb5/mal/Tests/tst302.stable.err
--- a/monetdb5/mal/Tests/tst302.stable.err
+++ b/monetdb5/mal/Tests/tst302.stable.err
@@ -30,16 +30,6 @@ stderr of test 'tst302` in directory 'mo
# 13:20:49 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
# 13:20:49 >
-MAPI = (monetdb) /var/tmp/mtest-7831/.s.monetdb.38226
-QUERY = #propagate INT exception
- # (you should be able to pass it upwards though)
- function foo();
- raise PermissionDeniedException := 1234;
- io.print("should not come here\n");
- end;
- mdb.List("user","foo");
- user.foo();
-ERROR = !MALException:user.foo[3]:Exception not caught
diff --git a/monetdb5/mal/Tests/tst303.stable.err
b/monetdb5/mal/Tests/tst303.stable.err
--- a/monetdb5/mal/Tests/tst303.stable.err
+++ b/monetdb5/mal/Tests/tst303.stable.err
@@ -44,8 +44,8 @@ QUERY = # recursively raise an exception
end;
mdb.List("user","foo");
user.foo();
-ERROR = !MALException:user.foo[5]:a second exception raised
- !MALException:user.foo[9]:Exception not caught
+ERROR = !MALException:user.foo[9]:MALException:user.foo[5]:a second exception
raised
+
# 09:00:01 >
# 09:00:01 > "Done."
diff --git a/monetdb5/mal/Tests/tst755.stable.err
b/monetdb5/mal/Tests/tst755.stable.err
--- a/monetdb5/mal/Tests/tst755.stable.err
+++ b/monetdb5/mal/Tests/tst755.stable.err
@@ -42,7 +42,7 @@ QUERY = # Polymorphic function tests
c:= bat.new(:str);
user.test(c,"hello");
ERROR = !TypeException:user.test[1]:'calc.+' undefined in: k:any :=
calc.+(1:int, "wrong":str);
- !MALException:user.test[0]:Error in cloned function
+ !TypeException:user.main[0]:Error in cloned function
!TypeException:user.main[5]:'user.test' undefined in:
user.test(c:bat[:str], "hello":str);
# 09:29:50 >
diff --git a/monetdb5/mal/Tests/tst760.stable.err
b/monetdb5/mal/Tests/tst760.stable.err
--- a/monetdb5/mal/Tests/tst760.stable.err
+++ b/monetdb5/mal/Tests/tst760.stable.err
@@ -41,7 +41,7 @@ QUERY = # Polymorphic function tests
c:= bat.new(:str);
user.test(c,"hello");
ERROR = !TypeException:user.test[1]:'calc.+' undefined in: k:any :=
calc.+(1:int, c:str);
- !MALException:user.test[0]:Error in cloned function
+ !TypeException:user.main[0]:Error in cloned function
!TypeException:user.main[4]:'user.test' undefined in:
user.test(c:bat[:str], "hello":str);
# 09:29:51 >
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
@@ -41,11 +41,10 @@ QUERY = # the multiplex code blocks. Tes
end;
mdb.List("user","foo");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
