Commit f292afdc authored by david_v's avatar david_v
Browse files

2003-06-13 Valentin David <valentin@lrde.epita.fr>

	* config/sdf-check.in: Use Cxx.tbl.

	* */Makefile.am, bootstrap: autoxt in config

	* configure.ac: Now --with-sdf-option and --with-boxedsdf.

	* src/pp/pp-cxx.str: Use the generated grammar.
	* src/pp/Options.pp: New file.
	* src/pp/Cxx-pretty.pp: Deleted file.
	* src/pp/pp-dxx.str: New file.

	* src/grammar/*.sdf: Pretty-print attributes added !
	* src/grammar/Makefile.am,
	* src/deterministic/Makefile.am: Use BoxedSdf.
parent 8404d189
2003-06-13 Valentin David <valentin@lrde.epita.fr>
* config/sdf-check.in: Use Cxx.tbl.
* */Makefile.am, bootstrap: autoxt in config
* configure.ac: Now --with-sdf-option and --with-boxedsdf.
* src/pp/pp-cxx.str: Use the generated grammar.
* src/pp/Options.pp: New file.
* src/pp/Cxx-pretty.pp: Deleted file.
* src/pp/pp-dxx.str: New file.
* src/grammar/*.sdf: Pretty-print attributes added!
* src/grammar/Makefile.am,
* src/deterministic/Makefile.am: Use BoxedSdf.
2003-06-13 Clement Vasseur <vasseu_c@lrde.epita.fr>
* README, Makefile.am, configure.ac, bootstrap, src/pp/Makefile.am,
......
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
SUBDIRS = config src test
BOOTCLEAN_SUBDIRS = src
DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST = bootstrap Makefile.xt
EXTRA_DIST = bootstrap
XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
......@@ -2,7 +2,5 @@
rm -f config.cache config.log acconfig.h aclocal.m4
autoxt
aclocal -I .
autoconf -f
automake -a -c -f
(cd config && autoxt)
env ACLOCAL="aclocal -I config" autoreconf -fvi
......@@ -12,3 +12,7 @@ install-sh \
missing \
mkinstalldirs \
depcomp
EXTRA_DIST = \
autoxt.m4 \
Makefile.xt
......@@ -3,7 +3,7 @@
PARSE=@SGLR@/bin/sglr
UNPARSE=@ASFIX_TOOLS@/bin/asfix-yield
table=@abs_top_srcdir@/src/grammar/Cpp.tbl
table=@abs_top_srcdir@/src/grammar/Cxx.tbl
tmp1=$(tempfile)
tmp2=$(tempfile)
......
......@@ -24,17 +24,19 @@ AM_INIT_AUTOMAKE([foreign 1.7.3 dist-bzip2])
USE_XT_PACKAGES
AC_ARG_WITH(transformers,
[ --with-transformers=DIR Specify location of TRANSFORMERS, []],
TRANSFORMERS_PATH="$withval",
TRANSFORMERS_PATH=""
AC_ARG_WITH(sdf-option,
[ --with-sdf-option=DIR Specify location of SDF_OPTION, [PREFIX]],
SDF_OPTION="$withval",
SDF_OPTION="$prefix"
)
AC_SUBST(TRANSFORMERS_PATH)
AC_SUBST(SDF_OPTION)
# Look for specific programs
# variables are AC_SUBSTed to work around an autoconf bug (corrected in CVS version)
AC_PATH_XPROG([SDF_OPTION], [sdf-option], [TRANSFORMERS_PATH])
AC_SUBST([SDF_OPTION])
AC_ARG_WITH(boxedsdf,
[ --with-boxedsdf=DIR Specify location of BOXEDSDF, [PREFIX]],
BOXEDSDF="$withval",
BOXEDSDF="$prefix"
)
AC_SUBST(BOXEDSDF)
# Loook for common programs
AC_LANG_C
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 111)
(Parent-Version meta-c++-grammar 0 110)
(Version-Log "from Clement Vasseur <vasseu_c@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 112)
(Parent-Version meta-c++-grammar 0 111)
(Version-Log "2003-06-13 Valentin David <valentin@lrde.epita.fr>
* README, Makefile.am, configure.ac, bootstrap, src/pp/Makefile.am,
* src/dxx-to-cxx/Makefile.am, src/cxx-to-dxx/Makefile.am,
* src/strategocxx/Makefile.am:
Cleanup.
* src/attribute/Makefile.am, src/attribute/asfix-attribute.str:
Use AsFix syntax from asfix-tools instead of keeping it in the `lib'
directory.
* src/grammar/Makefile.am, src/deterministic/Makefile.am:
Use `pp-sdf' instead of `pp'.
* src/signature/Makefile.am: Generate rtrees for distribution.
* lib/Layout.sdf: Move to...
* src/grammar/Layout.sdf: this.
* config/sdf-check.in: Use Cxx.tbl.
* */Makefile.am, bootstrap: autoxt in config
* configure.ac: Now --with-sdf-option and --with-boxedsdf.
* src/pp/pp-cxx.str: Use the generated grammar.
* src/pp/Options.pp: New file.
* src/pp/Cxx-pretty.pp: Deleted file.
* src/pp/pp-dxx.str: New file.
* src/grammar/*.sdf: Pretty-print attributes added !
* src/grammar/Makefile.am,
* src/deterministic/Makefile.am: Use BoxedSdf.
")
(New-Version-Log "")
(Checkin-Time "Fri, 13 Jun 2003 06:10:28 +0200")
(Checkin-Login vasseu_c)
(Checkin-Time "Fri, 13 Jun 2003 21:26:58 +0200")
(Checkin-Login david_v)
(Populate-Ignore
(
;; Temporary files.
......@@ -92,103 +93,103 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.107 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.8 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.108 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.9 644))
(README (meta-c++-grammar/g/37_README 1.3 600))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.2 600))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.3 644))
(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.20 600))
(src/grammar/Layout.sdf (meta-c++-grammar/4_Layout.sdf 1.3 600))
(config/sdf-check.in (meta-c++-grammar/f/37_sdf-check. 1.6 600))
(configure.ac (meta-c++-grammar/f/44_configure. 1.21 600))
(src/grammar/Layout.sdf (meta-c++-grammar/4_Layout.sdf 1.3 644))
(prj (meta-c++-grammar.prj) :symlink)
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.13 600))
(src/attribute/Makefile.am (meta-c++-grammar/g/31_Makefile.a 1.5 600))
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.14 644))
(src/attribute/Makefile.am (meta-c++-grammar/g/31_Makefile.a 1.6 644))
(src/attribute/asfix-attribute.str (meta-c++-grammar/g/32_Main.r 1.3 600))
(src/grammar/AccessSpecifiers.sdf (meta-c++-grammar/5_AccessSpec 1.4 600))
(src/grammar/AdditiveExpressions.sdf (meta-c++-grammar/6_AdditiveEx 1.6 600))
(src/grammar/AndExpressions.sdf (meta-c++-grammar/7_AndExpress 1.5 600))
(src/grammar/AsmDefinitions.sdf (meta-c++-grammar/8_AsmDefinit 1.4 600))
(src/grammar/AssignmentExpressions.sdf (meta-c++-grammar/9_Assignment 1.5 600))
(src/grammar/BaseSpecifiers.sdf (meta-c++-grammar/10_BaseSpecif 1.5 600))
(src/grammar/BooleanLiterals.sdf (meta-c++-grammar/11_BooleanLit 1.3 600))
(src/grammar/CastExpressions.sdf (meta-c++-grammar/12_CastExpres 1.5 600))
(src/grammar/CharacterLiterals.sdf (meta-c++-grammar/13_CharacterL 1.3 600))
(src/grammar/Characters.sdf (meta-c++-grammar/14_Characters 1.2 600))
(src/grammar/ClassSpecifiers.sdf (meta-c++-grammar/15_ClassSpeci 1.6 600))
(src/grammar/CompoundStatements.sdf (meta-c++-grammar/16_CompoundSt 1.4 600))
(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/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))
(src/grammar/Declarations.sdf (meta-c++-grammar/23_Declaratio 1.7 600))
(src/grammar/Declarators.sdf (meta-c++-grammar/24_Declarator 1.3 600))
(src/grammar/DeleteExpressions.sdf (meta-c++-grammar/25_DeleteExpr 1.4 600))
(src/grammar/ElaboratedTypeSpecifiers.sdf (meta-c++-grammar/26_Elaborated 1.5 600))
(src/grammar/EnumSpecifiers.sdf (meta-c++-grammar/27_EnumSpecif 1.5 600))
(src/grammar/EqualityExpressions.sdf (meta-c++-grammar/28_EqualityEx 1.5 600))
(src/grammar/EscapeSequences.sdf (meta-c++-grammar/29_EscapeSequ 1.2 600))
(src/grammar/ExceptionSpecifications.sdf (meta-c++-grammar/30_ExceptionS 1.4 600))
(src/grammar/ExclusiveOrExpressions.sdf (meta-c++-grammar/31_ExclusiveO 1.4 600))
(src/grammar/ExplicitInstantiations.sdf (meta-c++-grammar/32_ExplicitIn 1.4 600))
(src/grammar/ExplicitSpecializations.sdf (meta-c++-grammar/33_ExplicitSp 1.4 600))
(src/grammar/ExpressionStatements.sdf (meta-c++-grammar/34_Expression 1.4 600))
(src/grammar/Expressions.sdf (meta-c++-grammar/35_Expression 1.5 600))
(src/grammar/FloatingLiterals.sdf (meta-c++-grammar/36_FloatingLi 1.3 600))
(src/grammar/FunctionDefinitions.sdf (meta-c++-grammar/37_FunctionDe 1.5 600))
(src/grammar/FunctionSpecifiers.sdf (meta-c++-grammar/38_FunctionSp 1.4 600))
(src/grammar/IdExpressions.sdf (meta-c++-grammar/39_IdExpressi 1.6 600))
(src/grammar/Identifiers.sdf (meta-c++-grammar/40_Identifier 1.6 600))
(src/grammar/InclusiveOrExpressions.sdf (meta-c++-grammar/41_InclusiveO 1.4 600))
(src/grammar/InitDeclarators.sdf (meta-c++-grammar/42_InitDeclar 1.6 600))
(src/grammar/Initializers.sdf (meta-c++-grammar/43_Initialize 1.5 600))
(src/grammar/IntegerLiterals.sdf (meta-c++-grammar/44_IntegerLit 1.3 600))
(src/grammar/IterationStatements.sdf (meta-c++-grammar/45_IterationS 1.5 600))
(src/grammar/JumpStatements.sdf (meta-c++-grammar/46_JumpStatem 1.4 600))
(src/grammar/Keywords.sdf (meta-c++-grammar/47_Keywords.s 1.1 600))
(src/grammar/LabeledStatements.sdf (meta-c++-grammar/48_LabeledSta 1.4 600))
(src/grammar/LinkageSpecifications.sdf (meta-c++-grammar/49_LinkageSpe 1.4 600))
(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.13 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))
(src/grammar/Namespaces.sdf (meta-c++-grammar/b/4_Namespaces 1.5 600))
(src/grammar/NewExpressions.sdf (meta-c++-grammar/b/5_NewExpress 1.6 600))
(src/grammar/OperatorFunctionIds.sdf (meta-c++-grammar/b/6_OperatorFu 1.5 600))
(src/grammar/ParameterDeclarations.sdf (meta-c++-grammar/b/7_ParameterD 1.5 600))
(src/grammar/PmExpressions.sdf (meta-c++-grammar/b/8_PmExpressi 1.5 600))
(src/grammar/PostfixExpressions.sdf (meta-c++-grammar/b/9_PostfixExp 1.5 600))
(src/grammar/PrimaryExpressions.sdf (meta-c++-grammar/b/10_PrimaryExp 1.6 600))
(src/grammar/RelationalExpressions.sdf (meta-c++-grammar/b/11_Relational 1.5 600))
(src/grammar/SelectionStatements.sdf (meta-c++-grammar/b/12_SelectionS 1.5 600))
(src/grammar/ShiftExpressions.sdf (meta-c++-grammar/b/13_ShiftExpre 1.5 600))
(src/grammar/SimpleTypeSpecifiers.sdf (meta-c++-grammar/b/14_SimpleType 1.6 600))
(src/grammar/Specifiers.sdf (meta-c++-grammar/b/15_Specifiers 1.6 600))
(src/grammar/Statements.sdf (meta-c++-grammar/b/16_Statements 1.2 600))
(src/grammar/StorageClassSpecifiers.sdf (meta-c++-grammar/b/17_StorageCla 1.4 600))
(src/grammar/StringLiterals.sdf (meta-c++-grammar/b/18_StringLite 1.3 600))
(src/grammar/TemplateDeclarations.sdf (meta-c++-grammar/b/19_TemplateDe 1.5 600))
(src/grammar/TemplateIds.sdf (meta-c++-grammar/b/20_TemplateId 1.6 600))
(src/grammar/TemplateParameters.sdf (meta-c++-grammar/b/21_TemplatePa 1.5 600))
(src/grammar/ThrowExpressions.sdf (meta-c++-grammar/b/22_ThrowExpre 1.4 600))
(src/grammar/TranslationUnits.sdf (meta-c++-grammar/b/23_Translatio 1.4 600))
(src/grammar/TryBlocks.sdf (meta-c++-grammar/b/24_TryBlocks. 1.5 600))
(src/grammar/TypeIds.sdf (meta-c++-grammar/b/25_TypeIds.sd 1.6 600))
(src/grammar/TypeSpecifiers.sdf (meta-c++-grammar/b/26_TypeSpecif 1.2 600))
(src/grammar/UnaryExpressions.sdf (meta-c++-grammar/b/27_UnaryExpre 1.7 600))
(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/grammar/AccessSpecifiers.sdf (meta-c++-grammar/5_AccessSpec 1.4 644))
(src/grammar/AdditiveExpressions.sdf (meta-c++-grammar/6_AdditiveEx 1.7 644))
(src/grammar/AndExpressions.sdf (meta-c++-grammar/7_AndExpress 1.6 644))
(src/grammar/AsmDefinitions.sdf (meta-c++-grammar/8_AsmDefinit 1.5 644))
(src/grammar/AssignmentExpressions.sdf (meta-c++-grammar/9_Assignment 1.6 644))
(src/grammar/BaseSpecifiers.sdf (meta-c++-grammar/10_BaseSpecif 1.6 644))
(src/grammar/BooleanLiterals.sdf (meta-c++-grammar/11_BooleanLit 1.3 644))
(src/grammar/CastExpressions.sdf (meta-c++-grammar/12_CastExpres 1.6 644))
(src/grammar/CharacterLiterals.sdf (meta-c++-grammar/13_CharacterL 1.3 644))
(src/grammar/Characters.sdf (meta-c++-grammar/14_Characters 1.2 644))
(src/grammar/ClassSpecifiers.sdf (meta-c++-grammar/15_ClassSpeci 1.7 644))
(src/grammar/CompoundStatements.sdf (meta-c++-grammar/16_CompoundSt 1.5 644))
(src/grammar/ConditionalExpressions.sdf (meta-c++-grammar/17_Conditiona 1.5 644))
(src/grammar/ConstantExpressions.sdf (meta-c++-grammar/18_ConstantEx 1.2 644))
(src/grammar/ConversionFunctionIds.sdf (meta-c++-grammar/19_Conversion 1.5 644))
(src/grammar/Cxx.sdf (meta-c++-grammar/e/48_Cpp.sdf 1.3 644))
(src/grammar/CtorInitializers.sdf (meta-c++-grammar/20_CtorInitia 1.5 644))
(src/grammar/CvQualifiers.sdf (meta-c++-grammar/21_CvQualifie 1.4 644))
(src/grammar/DeclarationStatements.sdf (meta-c++-grammar/22_Declaratio 1.2 644))
(src/grammar/Declarations.sdf (meta-c++-grammar/23_Declaratio 1.8 644))
(src/grammar/Declarators.sdf (meta-c++-grammar/24_Declarator 1.4 644))
(src/grammar/DeleteExpressions.sdf (meta-c++-grammar/25_DeleteExpr 1.5 644))
(src/grammar/ElaboratedTypeSpecifiers.sdf (meta-c++-grammar/26_Elaborated 1.6 644))
(src/grammar/EnumSpecifiers.sdf (meta-c++-grammar/27_EnumSpecif 1.6 644))
(src/grammar/EqualityExpressions.sdf (meta-c++-grammar/28_EqualityEx 1.6 644))
(src/grammar/EscapeSequences.sdf (meta-c++-grammar/29_EscapeSequ 1.2 644))
(src/grammar/ExceptionSpecifications.sdf (meta-c++-grammar/30_ExceptionS 1.5 644))
(src/grammar/ExclusiveOrExpressions.sdf (meta-c++-grammar/31_ExclusiveO 1.5 644))
(src/grammar/ExplicitInstantiations.sdf (meta-c++-grammar/32_ExplicitIn 1.5 644))
(src/grammar/ExplicitSpecializations.sdf (meta-c++-grammar/33_ExplicitSp 1.5 644))
(src/grammar/ExpressionStatements.sdf (meta-c++-grammar/34_Expression 1.5 644))
(src/grammar/Expressions.sdf (meta-c++-grammar/35_Expression 1.6 644))
(src/grammar/FloatingLiterals.sdf (meta-c++-grammar/36_FloatingLi 1.3 644))
(src/grammar/FunctionDefinitions.sdf (meta-c++-grammar/37_FunctionDe 1.6 644))
(src/grammar/FunctionSpecifiers.sdf (meta-c++-grammar/38_FunctionSp 1.4 644))
(src/grammar/IdExpressions.sdf (meta-c++-grammar/39_IdExpressi 1.7 644))
(src/grammar/Identifiers.sdf (meta-c++-grammar/40_Identifier 1.7 644))
(src/grammar/InclusiveOrExpressions.sdf (meta-c++-grammar/41_InclusiveO 1.5 644))
(src/grammar/InitDeclarators.sdf (meta-c++-grammar/42_InitDeclar 1.7 644))
(src/grammar/Initializers.sdf (meta-c++-grammar/43_Initialize 1.6 644))
(src/grammar/IntegerLiterals.sdf (meta-c++-grammar/44_IntegerLit 1.3 644))
(src/grammar/IterationStatements.sdf (meta-c++-grammar/45_IterationS 1.6 644))
(src/grammar/JumpStatements.sdf (meta-c++-grammar/46_JumpStatem 1.5 644))
(src/grammar/Keywords.sdf (meta-c++-grammar/47_Keywords.s 1.1 644))
(src/grammar/LabeledStatements.sdf (meta-c++-grammar/48_LabeledSta 1.5 644))
(src/grammar/LinkageSpecifications.sdf (meta-c++-grammar/49_LinkageSpe 1.5 644))
(src/grammar/Literals.sdf (meta-c++-grammar/50_Literals.s 1.3 644))
(src/grammar/LogicalAndExpressions.sdf (meta-c++-grammar/51_LogicalAnd 1.5 644))
(src/grammar/LogicalOrExpressions.sdf (meta-c++-grammar/b/0_LogicalOrE 1.5 644))
(src/grammar/Makefile.am (meta-c++-grammar/f/47_Makefile.a 1.14 644))
(src/grammar/MemberSpecifications.sdf (meta-c++-grammar/b/1_MemberSpec 1.7 644))
(src/grammar/MultiplicativeExpressions.sdf (meta-c++-grammar/b/2_Multiplica 1.6 644))
(src/grammar/NamespaceAliases.sdf (meta-c++-grammar/b/3_NamespaceA 1.5 644))
(src/grammar/Namespaces.sdf (meta-c++-grammar/b/4_Namespaces 1.6 644))
(src/grammar/NewExpressions.sdf (meta-c++-grammar/b/5_NewExpress 1.7 644))
(src/grammar/OperatorFunctionIds.sdf (meta-c++-grammar/b/6_OperatorFu 1.6 644))
(src/grammar/ParameterDeclarations.sdf (meta-c++-grammar/b/7_ParameterD 1.6 644))
(src/grammar/PmExpressions.sdf (meta-c++-grammar/b/8_PmExpressi 1.6 644))
(src/grammar/PostfixExpressions.sdf (meta-c++-grammar/b/9_PostfixExp 1.6 644))
(src/grammar/PrimaryExpressions.sdf (meta-c++-grammar/b/10_PrimaryExp 1.7 644))
(src/grammar/RelationalExpressions.sdf (meta-c++-grammar/b/11_Relational 1.6 644))
(src/grammar/SelectionStatements.sdf (meta-c++-grammar/b/12_SelectionS 1.6 644))
(src/grammar/ShiftExpressions.sdf (meta-c++-grammar/b/13_ShiftExpre 1.6 644))
(src/grammar/SimpleTypeSpecifiers.sdf (meta-c++-grammar/b/14_SimpleType 1.7 644))
(src/grammar/Specifiers.sdf (meta-c++-grammar/b/15_Specifiers 1.7 644))
(src/grammar/Statements.sdf (meta-c++-grammar/b/16_Statements 1.2 644))
(src/grammar/StorageClassSpecifiers.sdf (meta-c++-grammar/b/17_StorageCla 1.4 644))
(src/grammar/StringLiterals.sdf (meta-c++-grammar/b/18_StringLite 1.3 644))
(src/grammar/TemplateDeclarations.sdf (meta-c++-grammar/b/19_TemplateDe 1.6 644))
(src/grammar/TemplateIds.sdf (meta-c++-grammar/b/20_TemplateId 1.7 644))
(src/grammar/TemplateParameters.sdf (meta-c++-grammar/b/21_TemplatePa 1.6 644))
(src/grammar/ThrowExpressions.sdf (meta-c++-grammar/b/22_ThrowExpre 1.4 644))
(src/grammar/TranslationUnits.sdf (meta-c++-grammar/b/23_Translatio 1.4 644))
(src/grammar/TryBlocks.sdf (meta-c++-grammar/b/24_TryBlocks. 1.6 644))
(src/grammar/TypeIds.sdf (meta-c++-grammar/b/25_TypeIds.sd 1.7 644))
(src/grammar/TypeSpecifiers.sdf (meta-c++-grammar/b/26_TypeSpecif 1.2 644))
(src/grammar/UnaryExpressions.sdf (meta-c++-grammar/b/27_UnaryExpre 1.8 644))
(src/grammar/UsingDeclarations.sdf (meta-c++-grammar/b/28_UsingDecla 1.5 644))
(src/grammar/UsingDirectives.sdf (meta-c++-grammar/b/29_UsingDirec 1.6 644))
(src/deterministic/Dxx.sdf (meta-c++-grammar/g/38_Cpp-det.sd 1.9 600))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.6 600))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.7 644))
(test/Makefile.am (meta-c++-grammar/f/45_Makefile.a 1.4 600))
(test/Makefile.am (meta-c++-grammar/f/45_Makefile.a 1.4 644))
(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))
......@@ -413,20 +414,35 @@
(test/our/expressions/primary-lit-integer-17-fail.cc (meta-c++-grammar/e/44_primary-li 1.1 600))
(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.7 600))
(src/dxx-to-cxx/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.6 600))
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.8 644))
(src/dxx-to-cxx/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.7 644))
(src/dxx-to-cxx/dxx-to-cxx.str (meta-c++-grammar/g/41_Main.r 1.6 600))
(src/cxx-to-dxx/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.6 600))
(src/cxx-to-dxx/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.7 644))
(src/cxx-to-dxx/cxx-to-dxx.str (meta-c++-grammar/g/43_Main.r 1.6 600))
(bootstrap (meta-c++-grammar/g/45_bootstrap 1.2 700))
(bootstrap (meta-c++-grammar/g/45_bootstrap 1.3 700))
(src/pp/unbox.str (meta-c++-grammar/g/46_unbox.str 1.1 600))
(src/pp/pp-cxx.str (meta-c++-grammar/g/47_pp-cpp.str 1.3 600))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.5 600))
(src/pp/Cxx-pretty.pp (meta-c++-grammar/g/49_Cpp-pretty 1.1 600))
(src/sdf/Makefile.am (meta-c++-grammar/g/50_Makefile.a 1.1 600))
(src/pp/pp-cxx.str (meta-c++-grammar/g/47_pp-cpp.str 1.4 600))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.6 644))
(src/sdf/Makefile.am (meta-c++-grammar/g/50_Makefile.a 1.2 644))
(src/strategocxx/CxxVariables.sdf (meta-c++-grammar/g/51_CxxVariabl 1.2 644))
(src/strategocxx/StrategoCxx.sdf (meta-c++-grammar/h/0_StrategoCx 1.2 644))
(src/strategocxx/Makefile.am (meta-c++-grammar/h/1_Makefile.a 1.2 600))
(src/strategocxx/Makefile.am (meta-c++-grammar/h/1_Makefile.a 1.3 644))
;; Files deleted by depopulate at Fri, 13 Jun 2003 17:35:12 +0200,
;; from version 0.111(w), by david_v:
; (src/pp/Cxx-pretty.pp ())
;; Files added by populate at Fri, 13 Jun 2003 20:04:09 +0200,
;; to version 0.111(w), by david_v:
(src/pp/Options.pp (meta-c++-grammar/h/2_Options.pp 1.1 644))
;; Files added by populate at Fri, 13 Jun 2003 20:18:21 +0200,
;; to version 0.111(w), by david_v:
(src/pp/pp-dxx.str (meta-c++-grammar/h/3_pp-dxx.str 1.1 600))
)
(Merge-Parents)
(New-Merge-Parents)
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
SUBDIRS = grammar deterministic signature attribute dxx-to-cxx cxx-to-dxx \
pp sdf strategocxx
......
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
-include asfix-attribute.c.dep
SCFLAGS = --main $* --verbose 0
......
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
-include cxx-to-dxx.c.dep
SCFLAGS = --main $* --verbose 0
......
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
PGEN_FLAGS = -m $*
pkgdata_DATA = Dxx.def Dxx.tbl Dxx.pp
pkgdata_DATA = Dxx.def Dxx.tbl Dxx.pp.af
EXTRA_DIST = $(SDFS)
SDFS = \
Dxx.sdf
Dxx.def: $(SDFS)
$(SDF_TOOLS)/bin/pack-sdf \
Dxx.def: Dxx.ppdef
$(BOXEDSDF)/bin/parse-boxedsdf -i $< | \
$(BOXEDSDF)/bin/boxed2sdf | \
$(GPP)/bin/pp-sdf -o $@
Dxx.pp: Dxx.ppdef
$(BOXEDSDF)/bin/parse-boxedsdf -i $< | \
$(BOXEDSDF)/bin/boxed2pp-table | \
$(GPP)/bin/pp-pp-table -o $@
Dxx.ppdef: $(SDFS)
$(BOXEDSDF)/bin/pack-boxedsdf \
-I $(top_srcdir)/lib \
-I $(top_srcdir)/src/grammar \
-i Dxx.sdf \
-i $(top_srcdir)/src/deterministic/Dxx.sdf \
| $(ASFIX_TOOLS)/bin/implode-asfix \
| $(SDF_OPTION) \
| $(SDF_OPTION)/bin/sdf-option \
| $(SDF_TOOLS)/bin/sdf-cons \
| $(SDF_TOOLS)/bin/sdf-bracket \
| $(SDF_FRONT)/bin/pp-sdf > $@
| $(BOXEDSDF)/bin/pp-boxedsdf -o $@
CLEANFILES = Dxx.def Dxx.tbl Dxx.pp
CLEANFILES = Dxx.def Dxx.tbl Dxx.pp Dxx.pp.af Dxx.ppdef
include $(top_srcdir)/Makefile.xt
include $(top_srcdir)/config/Makefile.xt
-include dxx-to-cxx.c.dep
SCFLAGS = --main $* --verbose 0
......
......@@ -14,5 +14,7 @@ exports
%% 5.7 [expr.add]
MultiplicativeExpression -> AdditiveExpression
AdditiveExpression "+" MultiplicativeExpression -> AdditiveExpression
AdditiveExpression "+" MultiplicativeExpression -> AdditiveExpression
{pp(H[H[_1 KW["+"]] _2])}
AdditiveExpression "-" MultiplicativeExpression -> AdditiveExpression
{pp(H[H[_1 KW["-"]] _2])}
\ No newline at end of file
......@@ -14,4 +14,5 @@ exports
%% 5.11 [expr.bit.and]
EqualityExpression -> AndExpression
AndExpression "&" EqualityExpression -> AndExpression
AndExpression "&" EqualityExpression -> AndExpression
{pp(H[H[_1 KW["&"]] _2])}
......@@ -13,4 +13,5 @@ exports
context-free syntax
%% 7.4 [dcl.asm]
"asm" "(" StringLiteral ")" ";" -> AsmDefinition
"asm" "(" StringLiteral ")" ";" -> AsmDefinition
{pp(H hs=0[H[KW["asm"] KW["("] _1 KW[")"]] KW[";"]])}
\ No newline at end of file
......@@ -16,18 +16,19 @@ exports
%% 5.17 [expr.ass]
ConditionalExpression -> AssignmentExpression
LogicalOrExpression AssignmentOperator AssignmentExpression -> AssignmentExpression
LogicalOrExpression AssignmentOperator AssignmentExpression -> AssignmentExpression
{pp(H[_1 _2 _3])}
ThrowExpression -> AssignmentExpression
%% 5.17 [expr.ass]
"=" -> AssignmentOperator
"*=" -> AssignmentOperator
"/=" -> AssignmentOperator
"%=" -> AssignmentOperator
"+=" -> AssignmentOperator
"-=" -> AssignmentOperator
">>=" -> AssignmentOperator
"<<=" -> AssignmentOperator
"&=" -> AssignmentOperator
"^=" -> AssignmentOperator
"|=" -> AssignmentOperator
"=" -> AssignmentOperator
"*=" -> AssignmentOperator
"/=" -> AssignmentOperator
"%=" -> AssignmentOperator
"+=" -> AssignmentOperator
"-=" -> AssignmentOperator
">>=" -> AssignmentOperator
"<<=" -> AssignmentOperator
"&=" -> AssignmentOperator
"^=" -> AssignmentOperator
"|=" -> AssignmentOperator
......@@ -11,16 +11,23 @@ exports
%% sorts
%%
%% BaseClause
context-free syntax
%% 10 [class.derived]
":" BaseSpecifierList -> BaseClause
":" BaseSpecifierList -> BaseClause
{pp(H[KW[":"] _1])}
%% 10 [class.derived]
{ BaseSpecifier "," }+ -> BaseSpecifierList
{pp(H[_1], .1:iter-sep=H hs=0[_1 KW[","]])}
%% 10 [class.derived]
"::"? NestedNameSpecifier? ClassName -> BaseSpecifier
{pp(H[H hs=0[_1 _2] _3], .1:opt=KW["::"])}
"virtual" AccessSpecifier? "::"? NestedNameSpecifier? ClassName -> BaseSpecifier
{pp(H[KW["virtual"] H hs=0[_1 _2 _3] _4], .2:opt=KW["::"])}
AccessSpecifier "virtual"? "::"? NestedNameSpecifier? ClassName -> BaseSpecifier
{pp(H[_1 _2 H hs=0[_3 _4] _5], .2:opt=KW["virtual"], .3:opt=KW["::"])}
......@@ -14,4 +14,5 @@ exports
%% 5.4 [expr.cast]
UnaryExpression -> CastExpression
"(" TypeId ")" CastExpression -> CastExpression
"(" TypeId ")" CastExpression -> CastExpression
{pp(H[H hs=0[KW["("] _1 KW[")"]] _2])}
......@@ -21,17 +21,21 @@ exports
%% 9 [class]
Identifier -> ClassName
TemplateId -> ClassName
TemplateId -> ClassName
%% 9 [class]
ClassHead "{" MemberSpecification? "}" -> ClassSpecifier
ClassHead "{" MemberSpecification? "}" -> ClassSpecifier
{pp(V[H[_1] V is=2[KW["{"] _2] KW["}"]])}
%% 9 [class]
ClassKey Identifier? BaseClause? -> ClassHead
ClassKey NestedNameSpecifier Identifier BaseClause? -> ClassHead
ClassKey NestedNameSpecifier? TemplateId BaseClause? -> ClassHead
ClassKey Identifier? BaseClause? -> ClassHead
{pp(H[_1 _2 _3])}
ClassKey NestedNameSpecifier Identifier BaseClause? -> ClassHead
{pp(H[_1 _2 _3 _4])}
ClassKey NestedNameSpecifier? TemplateId BaseClause? -> ClassHead
{pp(H[_1 _2 _3 _4])}
%% 9 [class]
"class" -> ClassKey
"struct" -> ClassKey
"union" -> ClassKey
"class" -> ClassKey
"struct" -> ClassKey
"union" -> ClassKey
......@@ -13,7 +13,8 @@ exports
context-free syntax
%% 6.3 [stmt.block]
"{" StatementSeq? "}" -> CompoundStatement
"{" StatementSeq? "}" -> CompoundStatement
{pp(V[V is=2[KW["{"] _1] KW["}"]])}
%% 6.3 [stmt.block]
Statement+ -> StatementSeq
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