Changeset: 9732ffe88488 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9732ffe88488
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sciql.c
sql/backends/monet5/sciql.h
sql/backends/monet5/sciql.mal
sql/backends/monet5/sciql.mx
Branch: sciql
Log Message:
Converted sciql.mx to .c/.h/.mal files.
diffs (225 lines):
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -48,7 +48,7 @@
sql_result.mx \
sql_readline.c \
sql_emptyset.c \
- sciql.mx \
+ sciql.c \
sql_bpm.c
LIBS = ../../server/libsqlserver \
../../storage/libstore \
@@ -102,7 +102,7 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = sql.mx sql_bpm.mal sciql.mx
+ SOURCES = sql.mx sql_bpm.mal sciql.mal
}
headers_autoload = {
@@ -111,5 +111,5 @@
SOURCES = 40_sql.mal
}
-EXTRA_DIST = 40_sql.mal sql_bpm.mal sql_bpm.h sql_emptyset.h sql_gencode.h
sql_optimizer.h sql_scenario.h sql_user.h sql_readline.h
+EXTRA_DIST = 40_sql.mal sql_bpm.mal sql_bpm.h sql_emptyset.h sql_gencode.h
sql_optimizer.h sql_scenario.h sql_user.h sql_readline.h sciql.mal sciql.h
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/sciql.mx b/sql/backends/monet5/sciql.c
rename from sql/backends/monet5/sciql.mx
rename to sql/backends/monet5/sciql.c
--- a/sql/backends/monet5/sciql.mx
+++ b/sql/backends/monet5/sciql.c
@@ -1,75 +1,30 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2011 MonetDB B.V.
+ * All Rights Reserved.
+ */
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f sciql
-@t SciQL runtime
-@a N.Nes, M.Kersten, J.Zhang, M.Ivanova
-@+ SciQL
-This module contains the additions for the SciQL extensions of SQL.
-This current focus is on testing the code generation.
-@mal
-module sciql;
-pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_1,
stop:any_1, step:any_1):bat[:oid,:any_1]
-address SCI1D
-comment "Define the dimension of a vector";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2
-)(:bat[:oid,:any_1], :bat[:oid,:any_2])
-address SCI2D
-comment "Define the dimensions of a 2D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2,
- col3:str, start3:any_3, stop3:any_3, step3:any_3
-)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3])
-address SCI3D
-comment "Define the dimensions of a 3D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2,
- col3:str, start3:any_3, stop3:any_3, step3:any_3,
- col4:str, start4:any_4, stop4:any_4, step4:any_4
-)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3], :bat[:oid,:any_4])
-address SCI3D
-comment "Define the dimensions of a 4D space";
-
-pattern setDefault(b:bat[:oid,:any_1], def:any_2):bat[:oid,:any_2]
-address SCIsetDefault
-comment "Create an array instance initialized with default values);
-@h
-#ifndef _SCIQL_H_
-#define _SCIQL_H_
-#include "sql.h" /* includes sql_backend.h */
-
-sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-
-#endif /* _SCIQL_H_ */
-
-@c
+/*
+ * @f sciql
+ * @t SciQL runtime
+ * @a N.Nes, M.Kersten, J.Zhang, M.Ivanova
+ * @+ SciQL
+ * This module contains the additions for the SciQL extensions of SQL.
+ * This current focus is on testing the code generation.
+ */
#include "monetdb_config.h"
#include "sql_user.h"
#include "sql_mvc.h"
diff --git a/sql/backends/monet5/sciql.h b/sql/backends/monet5/sciql.h
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/sciql.h
@@ -0,0 +1,31 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2011 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+#ifndef _SCIQL_H_
+#define _SCIQL_H_
+#include "sql.h" /* includes sql_backend.h */
+
+sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+
+#endif /* _SCIQL_H_ */
+
diff --git a/sql/backends/monet5/sciql.mal b/sql/backends/monet5/sciql.mal
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/sciql.mal
@@ -0,0 +1,49 @@
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+# Copyright August 2008-2011 MonetDB B.V.
+# All Rights Reserved.
+
+module sciql;
+pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_1,
stop:any_1, step:any_1):bat[:oid,:any_1]
+address SCI1D
+comment "Define the dimension of a vector";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2
+)(:bat[:oid,:any_1], :bat[:oid,:any_2])
+address SCI2D
+comment "Define the dimensions of a 2D space";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2,
+ col3:str, start3:any_3, stop3:any_3, step3:any_3
+)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3])
+address SCI3D
+comment "Define the dimensions of a 3D space";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2,
+ col3:str, start3:any_3, stop3:any_3, step3:any_3,
+ col4:str, start4:any_4, stop4:any_4, step4:any_4
+)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3], :bat[:oid,:any_4])
+address SCI3D
+comment "Define the dimensions of a 4D space";
+
+pattern setDefault(b:bat[:oid,:any_1], def:any_2):bat[:oid,:any_2]
+address SCIsetDefault
+comment "Create an array instance initialized with default values);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
