Changeset: 626a159a80b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=626a159a80b6
Modified Files:
buildtools/Mx/Code.c
buildtools/Mx/Def.c
buildtools/Mx/Form.c
buildtools/Mx/Mx.c
buildtools/Mx/Mx.h
buildtools/Mx/disclaimer.c
Branch: default
Log Message:
Remove C++ support from Mx.
diffs (130 lines):
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -70,7 +70,6 @@
break;
case Cdef:
case Csrc:
- case CCsrc:
case Clex:
case Cyacc:
case Prolog:
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -295,7 +295,6 @@
case Pimpl:
case Cdef:
case Csrc:
- case CCsrc:
case Cyacc:
case Clex:
case Prolog:
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -164,9 +164,6 @@
case Pspec:
PrCodeDisplay(d, "spec");
break;
- case CCsrc:
- PrCodeDisplay(d, "cc");
- break;
case Csrc:
PrCodeDisplay(d, "c");
break;
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -66,13 +66,12 @@
Message("\t-T <string>\tDefine default hide text <string>");
Message("\t-l\t\tNo #line and alike statements");
Message("\t-n\t\tNon changed files won't be touched");
- Message("\t-+\t\tTreat @c (C code) as @C (C++ code)");
}
int
main(int argc, char **argv)
{
- int i, k;
+ int i;
if (argc == 1) {
usage();
@@ -83,7 +82,7 @@
/* Preprocess the arguments.
*/
- while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln+")) != EOF) {
+ while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln")) != EOF) {
switch (i) {
case 'i':
textmode = M_TEXI;
@@ -131,13 +130,6 @@
case 'n':
notouch = 1;
break;
- case '+':
- k = 0;
- do {
- if (str2dir[k].code == Csrc)
- str2dir[k].ext = MX_CXX_SUFFIX;
- } while (str2dir[k++].code != Nop);
- break;
default:
Error("Unknown flag:%c", i);
usage();
@@ -183,7 +175,6 @@
{"+", Section, "",},
{"-", Subsection, "",},
{".", Paragraph, "",},
- {"C", CCsrc, MX_CXX_SUFFIX,},
{"i", Pimpl, "impl",},
{"s", Pspec, "spec",},
{"h", Cdef, "h",},
@@ -251,7 +242,6 @@
};
static struct comments comments[] = {
- { CCsrc, NULL, "//", NULL},
{ Cdef, "/*", " *", " */"},
{ Csrc, "/*", " *", " */"},
{ Cyacc, "/*", " *", " */"},
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -67,7 +67,7 @@
Bfile, Efile, Ofile, Mxmacro, Ifdef, Ifndef, Endif,
Title, Author, Version, Date, InHide, OutHide, Comment,
Module, Section, Subsection, Paragraph, Qcode, Continue,
- Pspec, Pimpl, Cdef, Csrc, CCsrc, ODLspec, SQL,
+ Pspec, Pimpl, Cdef, Csrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, MALcode,
Qnap, HTML, Java,
ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
diff --git a/buildtools/Mx/disclaimer.c b/buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c
+++ b/buildtools/Mx/disclaimer.c
@@ -133,15 +133,13 @@
const char *comment_prefix;
const char *comment_end;
} suffixes[] = {
- {
- "c", "/*", " * ", " */",}, {
- "h", "/*", " * ", " */",}, {
- MX_CXX_SUFFIX, "/*", " * ", " */",}, {
- "html", "<!--", "", " -->",}, {
- "tex", "", "% ", "",}, {
- "mal", "", "# ", "",}, {
- "mx", "", "@' ", ""}, {
- 0, 0, 0, 0}, /* sentinel */
+ {"c", "/*", " * ", " */",},
+ {"h", "/*", " * ", " */",},
+ {"html", "<!--", "", " -->",},
+ {"tex", "", "% ", "",},
+ {"mal", "", "# ", "",},
+ {"mx", "", "@' ", ""},
+ {0, 0, 0, 0}, /* sentinel */
};
#define DISC_SUFFIXES (sizeof(suffixes)/sizeof(siffixes[0]))
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
