Changeset: f6606676fe5e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6606676fe5e
Removed Files:
buildtools/Mx/Code.c
buildtools/Mx/Def.c
buildtools/Mx/Display.c
buildtools/Mx/Form.c
buildtools/Mx/Io.c
buildtools/Mx/Makefile.ag
buildtools/Mx/Mx.c
buildtools/Mx/Mx.h
buildtools/Mx/MxFcnDef.h
buildtools/Mx/Print.c
buildtools/Mx/Sys.c
buildtools/Mx/Tok.c
buildtools/Mx/disclaimer.c
buildtools/Mx/disclaimer.h
buildtools/Mx/getopt.c
buildtools/Mx/mx-mode.el
buildtools/Mx/mx_getopt.h
buildtools/Mx/warning.gif
monetdb5/modules/kernel/Tests/run
Modified Files:
NT/rules.msc
buildtools/Makefile.ag
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
buildtools/conf/fixlicense.py
buildtools/conf/rules.mk
configure.ag
Branch: default
Log Message:
Get rid of Mx.
diffs (truncated from 4253 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -246,7 +246,6 @@ LIBC_INCS = $(PTHREAD_INCS)
MATH_LIBS =
SOCKET_LIBS = wsock32.lib Ws2_32.lib
-MX=$(TOPDIR)\buildtools\Mx\Mx.exe
CP=copy
MV=copy
DEL=del
@@ -513,40 +512,6 @@ CFLAGS = $(CFLAGS) -DMONET_OID32
CONFIG_H = monetdb_config.h
-{$(srcdir)}.mx.h:
- $(MX) $(MXFLAGS) -l -x h $<
-
-.mx.h:
- $(MX) $(MXFLAGS) -l -x h $<
-
-{$(srcdir)}.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-{$(srcdir)}.mx.mal:
- $(MX) $(MXFLAGS) -l -x mal $<
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-.mx.mal:
- $(MX) $(MXFLAGS) -l -x mal $<
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-{$(srcdir)}.mx.sql:
- $(MX) $(MXFLAGS) -l -x sql $<
-
-.mx.sql:
- $(MX) $(MXFLAGS) -l -x sql $<
-
-{$(srcdir)}.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
-.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
{$(srcdir)}.c.obj:
$(CC) $(CFLAGS) -c $<
@@ -561,4 +526,4 @@ CONFIG_H = monetdb_config.h
echo EXPORTS > $@
type $< >> $@
-.SUFFIXES: .mx .syms .def
+.SUFFIXES: .syms .def
diff --git a/buildtools/Makefile.ag b/buildtools/Makefile.ag
--- a/buildtools/Makefile.ag
+++ b/buildtools/Makefile.ag
@@ -15,6 +15,6 @@
# Copyright August 2008-2013 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = Mx conf
+SUBDIRS = conf
EXTRA_DIST_DIR = autogen doc
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
deleted file mode 100644
--- a/buildtools/Mx/Code.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * 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-2013 MonetDB B.V.
- * All Rights Reserved.
- */
-
-#include <monetdb_config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "Mx.h"
-#include "MxFcnDef.h"
-
-void
-GenCode(void)
-{
- Def *d;
- char *fname = NULL;
- CmdCode bak = Nop;
-
- for (d = defs; d < defs + ndef; d++) {
- mx_file = d->d_file;
- mx_line = d->d_line;
- again:
- switch (d->d_dir) {
- case Bfile:
- case Ofile:{
- char *s;
-
- fname = d->d_cmd;
- for (s = fname; *s && !isspace((int) (*s)); s++)
- ;
- if (isspace((int) (*s)))
- *s = 0;
- if (s == fname) {
- Error("File name missing. %d", d->d_line);
- }
- }
- break;
- case Efile:
- UpdateFiles();
- break;
- case Title:
- case Author:
- case Version:
- case Date:
- break;
- case Module:
- case Section:
- case Ifdef:
- case Ifndef:
- case Endif:
- case Subsection:
- case Paragraph:
- case Continue:
- case Qcode:
- break;
- case Cdef:
- case Csrc:
- case Clex:
- case Cyacc:
- case Prolog:
- case Haskell:
- case OQLspec:
- case ODLspec:
- case SQL:
- case HTML:
- case MALcode:
- case Qnap:
- case Pspec:
- case ProC:
- case Shell:
- case Pimpl:
- case Java:
- case fGrammar:
- case Macro:
- case XML:
- case DTD:
- case XSL:
- case Config:
- case CCyacc:
- case CClex:
- if (!extract(d->d_dir))
- break;
- IoWriteFile(fname, d->d_dir);
- mode = d->d_dir;
- CodeBlk(d->d_blk);
- break;
- case Mxmacro:
- break;
- case Index0:
- case Index1:
- case Index2:
- case Index3:
- case Index4:
- case Index5:
- case Index6:
- case Index7:
- case Index8:
- case Index9:
- break;
- case InHide:
- HideOn();
- if (bak >= Qcode) {
- d->d_dir = bak;
- goto again;
- }
- break;
- case OutHide:
- HideOff();
- if (bak >= Qcode) {
- d->d_dir = bak;
- goto again;
- }
- break;
- case Comment:
- WriteComment(fname, d->d_blk);
- break;
- default:
- Fatal("GenCode", "Unknown directive:%c", d->d_dir);
- }
- bak = d->d_dir;
- }
-}
-
-char *
-Strndup(const char *src, size_t n)
-{
- char *dst = (char *) Malloc(n + 1);
-
- strncpy(dst, src, n);
- dst[n] = '\0';
- return dst;
-}
-
-Tok *
-solveCond(Tok * t)
-{
- char *arg[2] = {0, 0};
- int inside = 0;
- int ok = 1;
- int cmp = 0;
- char *s = t->t_str;
-
- for (; (t->t_str[0] && ok); t->t_str++) {
- switch (t->t_str[0]) {
- case '"':{
- inside ^= 1;
- };
- break;
- case '=':{
- if (!inside) {
- if (!cmp)
- arg[cmp] = Strndup(s, (t->t_str - s));
- s = t->t_str + 1;
- cmp = 1;
- }
- };
- break;
- case ':':{
- if (!inside) {
- t->t_str--;
- ok = 0;
- }
- };
- break;
- }
- }
- arg[cmp] = Strndup(s, (t->t_str - s));
- if (cmp)
- ok = !strcmp(arg[0], arg[1]);
- else
- ok = (arg[0][0] != '\0');
- if (ok)
- t->t_dir = *t->t_str;
- t->t_str++;
- Free(arg[0]);
- if (cmp)
- Free(arg[1]);
- DbTok(t);
- return t;
-}
-
-int _level = 0;
-
-void
-CodeBlk(char *blk)
-{
- Tok *t;
- char *c;
- int cond = 0;
-
- _level++;
-
- CodeLine();
-
- for (t = FstTok(blk); t != (Tok *) NULL; t = NxtTok(t)) {
- cond = 0;
- switch (t->t_dir) {
- case T_INDEX:
- ofile_printf("%s", t->t_str);
- break;
- case T_NEGCOND:
- cond = 1;
- case T_POSCOND:
- t = solveCond(t);
- cond ^= (t->t_dir == T_REFERENCE);
- if (!cond)
- break;
- case T_REFERENCE:
- CodeSub(t->t_str);
- CodeLine();
- break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
