Changeset: 20ce215c408f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20ce215c408f
Added Files:
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
Removed Files:
monetdb5/mal/mal_import.mx
Modified Files:
monetdb5/mal/Makefile.ag
Branch: default
Log Message:
de-Mx mal_import
diffs (truncated from 921 to 300 lines):
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -37,7 +37,7 @@ lib_mal = {
mal_exception.c mal_exception.h \
mal_factory.c mal_factory.h \
mal_function.c mal_function.h \
- mal_import.mx \
+ mal_import.c mal_import.h \
mal_instruction.mx \
mal_interpreter.mx \
mal_linker.c mal_linker.h \
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/mal_import.c
@@ -0,0 +1,408 @@
+/*
+ * 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://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * 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.
+ */
+
+/* Author(s) M.L. Kersten
+ * Module import
+ * The import statement simple switches the parser to a new input file, which
+ * takes precedence. The context for which the file should be interpreted
+ * is determined by the module name supplied.
+ * Typically this involves a module, whose definitions are stored at
+ * a known location.
+ * The import context is located. If the module already exists,
+ * we should silently skip parsing the file. This is handled at the parser
level.
+ * The files are extracted from a default location,
+ * namely the DBHOME/modules directory.
+ *
+ * If the string starts with '/' or '~' the context is not changed.
+ *
+ * Every IMPORT statement denotes a possible dynamic load library.
+ * Make sure it is loaded as well.
+*/
+
+#include "monetdb_config.h"
+#include "mal_import.h"
+#include "mal_interpreter.h" /* for showErrors() */
+#include "mal_linker.h" /* for loadModuleLibrary() */
+#include "mal_parser.h"
+
+void
+slash_2_dir_sep(str fname)
+{
+ char *s;
+
+ for (s = fname; *s; s++)
+ if (*s == '/')
+ *s = DIR_SEP;
+}
+
+static str
+malResolveFile(str fname)
+{
+ char path[PATHLENGTH];
+ str script;
+
+ snprintf(path, PATHLENGTH, "%s", fname);
+ slash_2_dir_sep(path);
+ if ((script = MSP_locate_script(path)) == NULL) {
+ /* this function is also called for scripts that are not located
+ * in the modpath, so if we can't find it, just default to
+ * whatever was given, as it can be in current dir, or an
+ * absolute location to somewhere */
+ script = GDKstrdup(fname);
+ }
+ return script;
+}
+
+static stream *
+malOpenSource(str file)
+{
+ stream *fd = NULL;
+
+ if (file)
+ fd = open_rastream(file);
+ return fd;
+}
+
+/*
+ * The malLoadScript routine merely reads the contents of a file into
+ * the input buffer of the client. It is typically used in situations
+ * where an intermediate file is used to pass commands around.
+ * Since the parser needs access to the complete block, we first have
+ * to find out how long the input is.
+ * For the time being, we assume at most 1Mb.
+*/
+str
+malLoadScript(Client c, str name, bstream **fdin)
+{
+ stream *fd;
+
+ fd = malOpenSource(name);
+ if (mnstr_errnr(fd) == MNSTR_OPEN_ERROR) {
+ mnstr_destroy(fd);
+ throw(MAL, "malInclude", "could not open file: %s", name);
+ }
+ *fdin = bstream_create(fd, 128 * BLOCK);
+ if (bstream_next(*fdin) < 0)
+ mnstr_printf(c->fdout, "!WARNING: could not read %s\n", name);
+ return MAL_SUCCEED;
+}
+
+/*
+ * Beware that we have to isolate the execution of the source file
+ * in its own environment. E.g. we have to removed the execution
+ * state until we are finished.
+ * The script being read my contain errors, such as non-balanced
+ * brackets as indicated by blkmode.
+ * It should be reset before continuing.
+*/
+#define restoreState \
+ bstream *oldfdin = c->fdin; \
+ int oldyycur = c->yycur; \
+ int oldlisting = c->listing; \
+ int oldmode = c->mode; \
+ int oldblkmode = c->blkmode; \
+ str oldsrcFile = c->srcFile; \
+ ClientInput *oldbak = c->bak; \
+ str oldprompt = c->prompt; \
+ Module oldnspace = c->nspace; \
+ Symbol oldprg = c->curprg; \
+ MalStkPtr oldglb = c->glb /* ; added by caller */
+#define restoreState3 \
+ int oldmode = c->mode; \
+ int oldblkmode = c->blkmode; \
+ str oldsrcFile = c->srcFile; \
+ Module oldnspace = c->nspace; \
+ Symbol oldprg = c->curprg; \
+ MalStkPtr oldglb = c->glb /* ; added by caller */
+
+#define restoreClient1 \
+ if (c->fdin) \
+ (void) bstream_destroy(c->fdin); \
+ c->fdin = oldfdin; \
+ c->yycur = oldyycur; \
+ c->listing = oldlisting; \
+ c->mode = oldmode; \
+ c->blkmode = oldblkmode; \
+ c->bak = oldbak; \
+ c->srcFile = oldsrcFile; \
+ if(c->prompt) GDKfree(c->prompt); \
+ c->prompt = oldprompt; \
+ c->promptlength= (int)strlen(c->prompt);
+#define restoreClient2 \
+ c->glb = oldglb; \
+ c->nspace = oldnspace; \
+ c->curprg = oldprg;
+#define restoreClient \
+ restoreClient1 \
+ restoreClient2
+#define restoreClient3 \
+ if (c->fdin) \
+ MCpopClientInput(c); \
+ c->mode = oldmode; \
+ c->blkmode = oldblkmode; \
+ c->srcFile = oldsrcFile;
+/*
+ * The include operation parses the file indentified and
+ * leaves the MAL code behind in the 'main' function.
+*/
+str
+malInclude(Client c, str name, int listing)
+{
+ str s= MAL_SUCCEED;
+ str filename;
+ str p;
+
+ bstream *oldfdin = c->fdin;
+ int oldyycur = c->yycur;
+ int oldlisting = c->listing;
+ int oldmode = c->mode;
+ int oldblkmode = c->blkmode;
+ ClientInput *oldbak = c->bak;
+ str oldprompt = c->prompt;
+ str oldsrcFile = c->srcFile;
+
+ MalStkPtr oldglb = c->glb;
+ Module oldnspace = c->nspace;
+ Symbol oldprg = c->curprg;
+
+ c->prompt = GDKstrdup(""); /* do not produce visible prompts */
+ c->promptlength = 0;
+ c->listing = listing;
+
+ c->fdin = NULL;
+
+ if ((filename = malResolveFile(name)) != NULL) {
+ name = filename;
+ do {
+ p = strchr(filename, PATH_SEP);
+ if (p)
+ *p = '\0';
+ c->srcFile = filename;
+ c->yycur = 0;
+ c->bak = NULL;
+ if ((s = malLoadScript(c, filename, &c->fdin)) == 0) {
+ parseMAL(c, c->curprg);
+ bstream_destroy(c->fdin);
+ }
+ if (p)
+ filename = p + 1;
+ } while (p);
+ GDKfree(name);
+ c->fdin = NULL;
+ }
+
+ restoreClient;
+ return s;
+}
+
+/*File and input processing
+ * A recurring situation is to execute a stream of simple MAL instructions
+ * stored on a file or comes from standard input. We parse one MAL
+ * instruction line at a time and attempt to execute it immediately.
+ * Note, this precludes entering complex MAL structures on the primary
+ * input channel, because 1) this requires complex code to keep track
+ * that we are in 'definition mode' 2) this requires (too) careful
+ * typing by the user, because he cannot make a typing error
+ *
+ * Therefore, all compound code fragments should be loaded and executed
+ * using the evalFile and callString command. It will parse the complete
+ * file into a MAL program block and execute it.
+ *
+ * Running looks much like an Import operation, except for the execution
+ * phase. This is performed in the context of an a priori defined
+ * stack frame. Life becomes a little complicated when the script contains
+ * a definition.
+*/
+str
+evalFile(Client c, str fname, int listing){
+ restoreState;
+ stream *fd;
+ str p;
+ str filename;
+ str msg= MAL_SUCCEED;
+
+ c->prompt = GDKstrdup(""); /* do not produce visible prompts */
+ c->promptlength = 0;
+ c->listing = listing;
+
+ c->fdin = NULL;
+
+ filename = malResolveFile(fname);
+ if (filename == NULL) {
+ mnstr_printf(c->fdout, "#WARNING: could not open file: %s\n",
fname);
+ restoreClient3;
+ restoreClient;
+ return msg;
+ }
+
+ fname = filename;
+ while ((p = strchr(filename, PATH_SEP)) != NULL) {
+ *p = '\0';
+ fd = malOpenSource(filename);
+ if (mnstr_errnr(fd) == MNSTR_OPEN_ERROR) {
+ mnstr_destroy(fd);
+ mnstr_printf(c->fdout, "#WARNING: could not open file:
%s\n",
+ filename);
+ } else {
+ c->srcFile = filename;
+ c->yycur = 0;
+ c->bak = NULL;
+ MSinitClientPrg(c, "user", "main"); /*
re-initialize context */
+ MCpushClientInput(c, bstream_create(fd, 128 * BLOCK),
c->listing, "");
+ msg = runScenario(c);
+ }
+ filename = p + 1;
+ }
+ fd = malOpenSource(filename);
+ if (mnstr_errnr(fd) == MNSTR_OPEN_ERROR) {
+ mnstr_destroy(fd);
+ mnstr_printf(c->fdout, "#WARNING: could not open file: %s\n",
+ filename);
+ } else {
+ c->srcFile = filename;
+ c->yycur = 0;
+ c->bak = NULL;
+ MSinitClientPrg(c, "user", "main"); /* re-initialize
context */
+ MCpushClientInput(c, bstream_create(fd, 128 * BLOCK),
c->listing, "");
+ msg = runScenario(c);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
