Commit 619ab58b authored by vasseu_c's avatar vasseu_c
Browse files

2003-05-26 Clement Vasseur <vasseu_c@lrde.epita.fr>

	* src/deterministic/Cpp-det.sdf, src/grammar/Cpp.sdf,
	* src/pp/Cpp-pretty.pp, src/cpp-to-det/cpp-to-det.str,
	* src/det-to-cpp/det-to-cpp.str, src/pp/pp-cpp.str:
	Rename as...
	* src/deterministic/Cxx-det.sdf, src/grammar/Cxx.sdf,
	* src/pp/Cxx-pretty.pp, src/cxx-to-det/cxx-to-det.str,
	* src/det-to-cxx/det-to-cxx.str, src/pp/pp-cxx.str:
	...these.

	* configure.ac, src/Makefile.am, src/grammar/Cxx.sdf,
	* src/grammar/Makefile.am, src/deterministic/Cxx-det.sdf,
	* src/deterministic/Makefile.am, test/Makefile.am,
	* src/signature/Makefile.am, src/det-to-cxx/Makefile.am,
	* src/det-to-cxx/det-to-cxx.str, src/cxx-to-det/Makefile.am,
	* src/cxx-to-det/cxx-to-det.str, src/pp/pp-cxx.str, src/pp/Makefile.am:
	Rename cpp to cxx everywhere.
parent 6cbfa4d5
2003-05-26 Clement Vasseur <vasseu_c@lrde.epita.fr>
* src/deterministic/Cpp-det.sdf, src/grammar/Cpp.sdf,
* src/pp/Cpp-pretty.pp, src/cpp-to-det/cpp-to-det.str,
* src/det-to-cpp/det-to-cpp.str, src/pp/pp-cpp.str:
Rename as...
* src/deterministic/Cxx-det.sdf, src/grammar/Cxx.sdf,
* src/pp/Cxx-pretty.pp, src/cxx-to-det/cxx-to-det.str,
* src/det-to-cxx/det-to-cxx.str, src/pp/pp-cxx.str:
...these.
* configure.ac, src/Makefile.am, src/grammar/Cxx.sdf,
* src/grammar/Makefile.am, src/deterministic/Cxx-det.sdf,
* src/deterministic/Makefile.am, test/Makefile.am,
* src/signature/Makefile.am, src/det-to-cxx/Makefile.am,
* src/det-to-cxx/det-to-cxx.str, src/cxx-to-det/Makefile.am,
* src/cxx-to-det/cxx-to-det.str, src/pp/pp-cxx.str, src/pp/Makefile.am:
Rename cpp to cxx everywhere.
2003-05-14 Quc Peyrot <chojin@lrde.epita.fr>
* src/pp/Makefile.am (STRINCLUDES): Remove it.
......
......@@ -10,7 +10,7 @@ fi
# Autoconf 2.53 needed so that buggy PATH_SEPARATOR is fixed.
AC_PREREQ(2.53)
AC_INIT(cpp-grammar, 0.1)
AC_INIT(cxx-grammar, 0.1)
# Auxiliary files
AC_CONFIG_AUX_DIR(config)
......@@ -55,8 +55,8 @@ AC_CONFIG_FILES([Makefile
src/deterministic/Makefile
src/attribute/Makefile
src/signature/Makefile
src/det-to-cpp/Makefile
src/cpp-to-det/Makefile
src/det-to-cxx/Makefile
src/cxx-to-det/Makefile
src/pp/Makefile
test/Makefile])
AC_OUTPUT
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 106)
(Parent-Version meta-c++-grammar 0 105)
(Version-Log "from Quc Peyrot <chojin@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 107)
(Parent-Version meta-c++-grammar 0 106)
(Version-Log "2003-05-26 Clement Vasseur <vasseu_c@lrde.epita.fr>
* src/pp/Makefile.am (STRINCLUDES): Remove it.
This variable was bugged since $(XTCFLAGS) already has \"-I\" inside.
(SCFLAGS): Add \"--verbose 0 $(XTCFLAGS)\".
* src/deterministic/Cpp-det.sdf, src/grammar/Cpp.sdf,
* src/pp/Cpp-pretty.pp, src/cpp-to-det/cpp-to-det.str,
* src/det-to-cpp/det-to-cpp.str, src/pp/pp-cpp.str:
Rename as...
* src/deterministic/Cxx-det.sdf, src/grammar/Cxx.sdf,
* src/pp/Cxx-pretty.pp, src/cxx-to-det/cxx-to-det.str,
* src/det-to-cxx/det-to-cxx.str, src/pp/pp-cxx.str:
...these.
* configure.ac, src/Makefile.am, src/grammar/Cxx.sdf,
* src/grammar/Makefile.am, src/deterministic/Cxx-det.sdf,
* src/deterministic/Makefile.am, test/Makefile.am,
* src/signature/Makefile.am, src/det-to-cxx/Makefile.am,
* src/det-to-cxx/det-to-cxx.str, src/cxx-to-det/Makefile.am,
* src/cxx-to-det/cxx-to-det.str, src/pp/pp-cxx.str, src/pp/Makefile.am:
Rename cpp to cxx everywhere.
")
(New-Version-Log "")
(Checkin-Time "Wed, 14 May 2003 22:13:26 +0200")
(Checkin-Login chojin)
(Checkin-Time "Mon, 26 May 2003 17:21:30 +0200")
(Checkin-Login vasseu_c)
(Populate-Ignore
(
;; Temporary files.
......@@ -82,7 +95,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.102 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.103 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.6 600))
(TODO (meta-c++-grammar/f/27_TODO 1.2 600))
(README (meta-c++-grammar/g/37_README 1.2 600))
......@@ -91,7 +104,7 @@
(config/ccview.sh (meta-c++-grammar/f/36_ccview.sh 1.1 700))
(config/disambiguate-check.in (meta-c++-grammar/f/38_disambigua 1.6 600))
(config/sdf-check.in (meta-c++-grammar/f/37_sdf-check. 1.5 600))
(configure.ac (meta-c++-grammar/f/44_configure. 1.16 600))
(configure.ac (meta-c++-grammar/f/44_configure. 1.17 600))
(lib/Layout.sdf (meta-c++-grammar/4_Layout.sdf 1.3 600))
(lib/Makefile.am (meta-c++-grammar/f/49_Makefile.a 1.4 600))
......@@ -104,7 +117,7 @@
(prj (meta-c++-grammar.prj) :symlink)
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.10 600))
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.11 600))
(src/attribute/Makefile.am (meta-c++-grammar/g/31_Makefile.a 1.4 600))
(src/attribute/asfix-attribute.str (meta-c++-grammar/g/32_Main.r 1.2 600))
......@@ -123,7 +136,7 @@
(src/grammar/ConditionalExpressions.sdf (meta-c++-grammar/17_Conditiona 1.4 600))
(src/grammar/ConstantExpressions.sdf (meta-c++-grammar/18_ConstantEx 1.2 600))
(src/grammar/ConversionFunctionIds.sdf (meta-c++-grammar/19_Conversion 1.4 600))
(src/grammar/Cpp.sdf (meta-c++-grammar/e/48_Cpp.sdf 1.2 600))
(src/grammar/Cxx.sdf (meta-c++-grammar/e/48_Cpp.sdf 1.3 600))
(src/grammar/CtorInitializers.sdf (meta-c++-grammar/20_CtorInitia 1.4 600))
(src/grammar/CvQualifiers.sdf (meta-c++-grammar/21_CvQualifie 1.4 600))
(src/grammar/DeclarationStatements.sdf (meta-c++-grammar/22_Declaratio 1.2 600))
......@@ -157,7 +170,7 @@
(src/grammar/Literals.sdf (meta-c++-grammar/50_Literals.s 1.3 600))
(src/grammar/LogicalAndExpressions.sdf (meta-c++-grammar/51_LogicalAnd 1.4 600))
(src/grammar/LogicalOrExpressions.sdf (meta-c++-grammar/b/0_LogicalOrE 1.4 600))
(src/grammar/Makefile.am (meta-c++-grammar/f/47_Makefile.a 1.11 600))
(src/grammar/Makefile.am (meta-c++-grammar/f/47_Makefile.a 1.12 600))
(src/grammar/MemberSpecifications.sdf (meta-c++-grammar/b/1_MemberSpec 1.6 600))
(src/grammar/MultiplicativeExpressions.sdf (meta-c++-grammar/b/2_Multiplica 1.5 600))
(src/grammar/NamespaceAliases.sdf (meta-c++-grammar/b/3_NamespaceA 1.4 600))
......@@ -188,10 +201,10 @@
(src/grammar/UsingDeclarations.sdf (meta-c++-grammar/b/28_UsingDecla 1.4 600))
(src/grammar/UsingDirectives.sdf (meta-c++-grammar/b/29_UsingDirec 1.5 600))
(src/deterministic/Cpp-det.sdf (meta-c++-grammar/g/38_Cpp-det.sd 1.7 600))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.3 600))
(src/deterministic/Cxx-det.sdf (meta-c++-grammar/g/38_Cpp-det.sd 1.8 600))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.4 600))
(test/Makefile.am (meta-c++-grammar/f/45_Makefile.a 1.3 600))
(test/Makefile.am (meta-c++-grammar/f/45_Makefile.a 1.4 600))
(test/g++/abi/bitfield1.C (meta-c++-grammar/b/30_bitfield1. 1.1 600))
(test/g++/abi/bitfield2.C (meta-c++-grammar/b/31_bitfield2. 1.1 600))
(test/g++/abi/empty4.C (meta-c++-grammar/b/32_empty4.C 1.1 600))
......@@ -417,13 +430,13 @@
(test/our/expressions/primary-par.cc (meta-c++-grammar/e/45_primary-pa 1.1 600))
(test/our/expressions/primary-this.cc (meta-c++-grammar/e/46_primary-th 1.1 600))
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.4 600))
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.5 600))
(src/det-to-cpp/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.3 600))
(src/det-to-cpp/det-to-cpp.str (meta-c++-grammar/g/41_Main.r 1.4 600))
(src/det-to-cxx/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.4 600))
(src/det-to-cxx/det-to-cxx.str (meta-c++-grammar/g/41_Main.r 1.5 600))
(src/cpp-to-det/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.3 600))
(src/cpp-to-det/cpp-to-det.str (meta-c++-grammar/g/43_Main.r 1.4 600))
(src/cxx-to-det/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.4 600))
(src/cxx-to-det/cxx-to-det.str (meta-c++-grammar/g/43_Main.r 1.5 600))
(stdconfig (meta-c++-grammar/g/44_stdconfig 1.3 700))
(bootstrap (meta-c++-grammar/g/45_bootstrap 1.1 700))
......@@ -432,9 +445,9 @@
;; to version 0.102(w), by david_v:
(src/pp/unbox.str (meta-c++-grammar/g/46_unbox.str 1.1 600))
(src/pp/pp-cpp.str (meta-c++-grammar/g/47_pp-cpp.str 1.1 600))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.3 600))
(src/pp/Cpp-pretty.pp (meta-c++-grammar/g/49_Cpp-pretty 1.1 600))
(src/pp/pp-cxx.str (meta-c++-grammar/g/47_pp-cpp.str 1.2 600))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.4 600))
(src/pp/Cxx-pretty.pp (meta-c++-grammar/g/49_Cpp-pretty 1.1 600))
)
(Merge-Parents)
(New-Merge-Parents)
SUBDIRS = grammar deterministic signature attribute det-to-cpp cpp-to-det \
SUBDIRS = grammar deterministic signature attribute det-to-cxx cxx-to-det \
pp
include $(top_srcdir)/Makefile.xt
......@@ -5,12 +5,12 @@ SCFLAGS = --main $* --verbose 0 $(XTCFLAGS)
STRINCLUDES = -I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature
bin_PROGRAMS = cpp-to-det
bin_PROGRAMS = cxx-to-det
cpp-to-det.o : xtc-conf.h
cxx-to-det.o : xtc-conf.h
BOOTCLEANFILES = cpp-to-det.c
BOOTCLEANFILES = cxx-to-det.c
EXTRA_DIST = cpp-to-det.str
EXTRA_DIST = cxx-to-det.str
CLEANFILES = *.dep *.atree *.mtree *.txt *.af *.afexp *.aexp *.abox
module cpp-to-det
module cxx-to-det
imports
......@@ -6,7 +6,7 @@ imports
imports
Cpp-det
Cxx-det
rules
......@@ -49,6 +49,6 @@ strategies
strategies
Cpp-to-det = expr-prim + dcl-spec + dcl-enum + namespace-def + class +
Cxx-to-det = expr-prim + dcl-spec + dcl-enum + namespace-def + class +
gram-key + expr
cpp-to-det = iowrap (topdown (try (Cpp-to-det)))
cxx-to-det = iowrap (topdown (try (Cxx-to-det)))
......@@ -5,12 +5,12 @@ SCFLAGS = --main $* --verbose 0 $(XTCFLAGS)
STRINCLUDES = -I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature
bin_PROGRAMS = det-to-cpp
bin_PROGRAMS = det-to-cxx
det-to-cpp.o : xtc-conf.h
det-to-cxx.o : xtc-conf.h
BOOTCLEANFILES = det-to-cpp.c
BOOTCLEANFILES = det-to-cxx.c
EXTRA_DIST = det-to-cpp.str
EXTRA_DIST = det-to-cxx.str
CLEANFILES = *.dep *.atree *.mtree *.txt *.af *.afexp *.aexp *.abox
module det-to-cpp
module det-to-cxx
imports
......@@ -6,7 +6,7 @@ imports
imports
Cpp-det
Cxx-det
rules
......@@ -50,6 +50,6 @@ strategies
strategies
Det-to-cpp = expr-prim + dcl-spec + dcl-enum + namespace-def + class +
Det-to-cxx = expr-prim + dcl-spec + dcl-enum + namespace-def + class +
gram-key + expr
det-to-cpp = iowrap (topdown (try (Det-to-cpp)))
det-to-cxx = iowrap (topdown (try (Det-to-cxx)))
......@@ -2,22 +2,22 @@ include $(top_srcdir)/Makefile.xt
PGEN_FLAGS = -m $*
pkgdata_DATA = Cpp-det.def Cpp-det.tbl Cpp-det.pp
pkgdata_DATA = Cxx-det.def Cxx-det.tbl Cxx-det.pp
EXTRA_DIST = $(SDFS)
SDFS = \
Cpp-det.sdf
Cxx-det.sdf
Cpp-det.def: $(SDFS)
Cxx-det.def: $(SDFS)
$(SDF_TOOLS)/bin/pack-sdf \
-I $(top_srcdir)/lib \
-I $(top_srcdir)/src/grammar \
-i Cpp-det.sdf \
-i Cxx-det.sdf \
| $(ASFIX_TOOLS)/bin/implode-asfix \
| $(SDF_OPTION) \
| $(SDF_TOOLS)/bin/sdf-cons \
| $(SDF_TOOLS)/bin/sdf-bracket \
| $(GPP)/bin/pp -a -l sdf -v 2.1 > $@
CLEANFILES = Cpp-det.def Cpp-det.tbl Cpp-det.pp
CLEANFILES = Cxx-det.def Cxx-det.tbl Cxx-det.pp
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.xt
PGEN_FLAGS = -m $*
pkgdata_DATA = Cpp.def Cpp.tbl Cpp.pp
pkgdata_DATA = Cxx.def Cxx.tbl Cxx.pp
EXTRA_DIST = $(SDFS)
......@@ -22,7 +22,7 @@ SDFS = \
ConditionalExpressions.sdf \
ConstantExpressions.sdf \
ConversionFunctionIds.sdf \
Cpp.sdf \
Cxx.sdf \
CtorInitializers.sdf \
CvQualifiers.sdf \
DeclarationStatements.sdf \
......@@ -86,12 +86,12 @@ SDFS = \
UsingDeclarations.sdf \
UsingDirectives.sdf
Cpp.def : $(SDFS)
$(SDF_TOOLS)/bin/pack-sdf -I $(top_srcdir)/lib -i Cpp.sdf \
Cxx.def : $(SDFS)
$(SDF_TOOLS)/bin/pack-sdf -I $(top_srcdir)/lib -i Cxx.sdf \
| $(ASFIX_TOOLS)/bin/implode-asfix \
| $(SDF_OPTION) \
| $(SDF_TOOLS)/bin/sdf-cons \
| $(SDF_TOOLS)/bin/sdf-bracket \
| $(GPP)/bin/pp -a -l sdf -v 2.1 > $@
CLEANFILES = Cpp.def Cpp.tbl Cpp.pp
CLEANFILES = Cxx.def Cxx.tbl Cxx.pp
include $(top_srcdir)/Makefile.xt
bin_PROGRAMS = pp-cpp
bin_PROGRAMS = pp-cxx
SCFLAGS = --main $* --verbose 0 $(XTCFLAGS)
#STRINCLUDES =
pkgdata_DATA = Cpp-pretty.pp.af
EXTRA_DIST = Cpp-pretty.pp pp-cpp.str unbox.str
CLEANFILES = Cpp-pretty.pp.af
STRINCLUDES = -I /usr/share/xt-strategoxt/gpp
pkgdata_DATA = Cxx-pretty.pp.af
EXTRA_DIST = Cxx-pretty.pp pp-cxx.str unbox.str
CLEANFILES = Cxx-pretty.pp.af
#pp-cpp: unbox.str
#pp-cxx: unbox.str
module pp-cpp
imports xtc-lib stratego-xt-xtc-tools unbox
module pp-cxx
imports xtc-lib stratego-xt-xtc-tools
strategies
pp-cpp = xtc-io-wrap(
pp-cxx = xtc-io-wrap(
xtc-transform(!"ast2abox",
!["-p", <xtc-find> "Cpp-pretty.pp.af"])
!["-p", <xtc-find> "Cxx-pretty.pp.af"])
; xtc-abox-format
; unbox
; xtc-abox2text
......
include $(top_srcdir)/Makefile.xt
pkgdata_DATA = Cpp-det.def Cpp-det.str
pkgdata_DATA = Cxx-det.def Cxx-det.str
Cpp-det.def: $(top_builddir)/src/deterministic/Cpp-det.def
Cxx-det.def: $(top_builddir)/src/deterministic/Cxx-det.def
cp $< $@
CLEANFILES = Cpp-det.def *.str
CLEANFILES = Cxx-det.def *.str
......@@ -2,7 +2,7 @@
check : check-parse
TABLE = $(top_builddir)/src/grammar/Cpp.tbl
TABLE = $(top_builddir)/src/grammar/Cxx.tbl
check-parse : $(TABLE)
$(top_srcdir)/config/sdf-check `find . -name '*.cc' -o -name '*.C'`\
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment