Commit 918e66d0 authored by david_v's avatar david_v
Browse files

2004-01-23 Valentin David <valentin@lrde.epita.fr>

	* src/strategocxx/Makefile.am,
	* test/disambiguate/Makefile.am,
	* test/expressions/Makefile.am,
	* test/g++/template/Makefile.am,
	* src/disamb/disambiguate/Makefile.am,
	* src/disamb/specifier/Stop.str,
	* src/disamb/namespace/NamespaceDefinition.str,
	* config/check-rules.mk,
	* src/disamb/classparam/Makefile.am: Fix.
parent 39e61dd1
2004-01-23 Valentin David <valentin@lrde.epita.fr>
* src/strategocxx/Makefile.am,
* test/disambiguate/Makefile.am,
* test/expressions/Makefile.am,
* test/g++/template/Makefile.am,
* src/disamb/disambiguate/Makefile.am,
* src/disamb/specifier/Stop.str,
* src/disamb/namespace/NamespaceDefinition.str,
* config/check-rules.mk,
* src/disamb/classparam/Makefile.am: Fix.
2004-01-22 Valentin David <valentin@lrde.epita.fr>
* configure.ac, src/disamb/Makefile.am: Update.
......
......@@ -37,7 +37,7 @@ CXX_PP_AF=$(top_builddir)/src/syn/Cxx.pp.af
# Check that the disambiguation has kept the right branches
.astcc.diff:
$(SGLR)/bin/sglr -2 -t -fi -A -p $(DXX_TBL) \
-i $(<:.astcc=.detcc) | \
-i $(srcdir)/$(<:.astcc=.detcc) | \
$(ASFIX_TOOLS)/bin/implode-asfix -o $(<:.astcc=.astcc2)
diff $< $(<:.astcc=.astcc2) > $@
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 139)
(Parent-Version meta-c++-grammar 0 138)
(Project-Version meta-c++-grammar 0 140)
(Parent-Version meta-c++-grammar 0 139)
(New-Version-Log "")
(Version-Log "2004-01-22 Valentin David <valentin@lrde.epita.fr>
* configure.ac, src/disamb/Makefile.am: Update.
* TODO: Update.
* src/syn/TemplateParameters.sdf: Add tag for deterministic syntax.
* test/disambiguate/template-05.cc,
* test/disambiguate/template-10.detcc,
* test/disambiguate/template-09.detcc,
* test/disambiguate/template-05.detcc: Fix.
* test/disambiguate/test.test, test/disambiguate/Makefile.am,
* test/expressions/Makefile.am, test/expressions/test.test,
* test/g++/template/Makefile.am, test/g++/template/test.test,
* test/g++/parse/Makefile.am, test/g++/parse/test.test,
* test/g++/overload/Makefile.am, test/g++/overload/test.test,
* test/g++/other/Makefile.am, test/g++/other/test.test,
* test/g++/opt/Makefile.am, test/g++/opt/test.test,
* test/g++/lookup/Makefile.am, test/g++/lookup/test.test,
* test/g++/init/Makefile.am, test/g++/init/test.test,
* test/g++/inherit/Makefile.am, test/g++/inherit/test.test,
* test/g++/eh/Makefile.am, test/g++/eh/test.test,
* test/g++/debug/Makefile.am, test/g++/debug/test.test,
* test/g++/abi/Makefile.am, test/g++/abi/test.test: Fix and update.
* src/disamb/disambiguate/TemplateArguments.str,
* src/disamb/disambiguate/TemplateTraverse.str,
* src/disamb/disambiguate/TemplateDefinition.str,
* src/disamb/disambiguate/TemplateClassTraverse.str,
* src/disamb/disambiguate/TemplateClassDefinition.str,
* src/disamb/disambiguate/SimpleTypeSpecifier.str,
* src/disamb/disambiguate/ResolveCompound.str,
* src/disamb/disambiguate/Resolve.str,
* src/disamb/disambiguate/PrimaryExpression.str,
* src/disamb/disambiguate/Parameter.str,
(Version-Log "2004-01-23 Valentin David <valentin@lrde.epita.fr>
* src/strategocxx/Makefile.am,
* test/disambiguate/Makefile.am,
* test/expressions/Makefile.am,
* test/g++/template/Makefile.am,
* src/disamb/disambiguate/Makefile.am,
* src/disamb/disambiguate/afcxx-disambiguate.str,
* src/disamb/disambiguate/Kinds.str,
* src/disamb/disambiguate/Keys.str,
* src/disamb/disambiguate/Definition.str,
* src/disamb/disambiguate/ClassOrNamespaceTraverse.str,
* src/disamb/disambiguate/ClassOrNamespaceAmbiguity.str,
* src/disamb/disambiguate/BaseTraverse.str,
* src/disamb/disambiguate/AmbiguityCandidate.str: Fix several bugs.
* src/parser/parse-cxx.str, config/check-rules.mk: Update.
* src/disamb/simpledeclaration/Makefile.am,
* src/disamb/simpledeclaration/afcxx-simpledeclaration.str,
* src/disamb/simpledeclaration/afcxx-simpledeclaration.meta: New.
* src/disamb/classparam/Makefile.am,
* src/disamb/classparam/afcxx-classparam.str,
* src/disamb/classparam/afcxx-classparam.meta: New.
* src/disamb/disambiguate/PostfixExpressionAmbiguity.str,
* src/disamb/disambiguate/PostfixExpressionAmbiguity.meta,
* src/disamb/disambiguate/PostfixExpressionAmbiguityCandidate.str,
* src/disamb/disambiguate/PostfixExpressionAmbiguityCandidate.meta,
* src/disamb/disambiguate/TemplateIdAmbiguityCut.str,
* src/disamb/disambiguate/TemplateIdAmbiguityCandidate.str,
* src/disamb/disambiguate/TemplateIdAmbiguity.str,
* src/disamb/disambiguate/TemplateIdAmbiguityCut.meta,
* src/disamb/disambiguate/TemplateIdAmbiguityCandidate.meta,
* src/disamb/disambiguate/TemplateIdAmbiguity.meta,
* src/disamb/disambiguate/TemplateFunctionDefinitionCandidate.str,
* src/disamb/disambiguate/TemplateFunctionDefinition.str,
* src/disamb/disambiguate/TemplateFunctionDefinitionCandidate.meta,
* src/disamb/disambiguate/TemplateFunctionDefinition.meta,
* src/disamb/disambiguate/TemplateFunctionTraverse.str,
* src/disamb/disambiguate/TemplateFunctionTraverse.meta: New.
* src/disamb/ambdown/ambdown.str, src/disamb/ambdown/Makefile.am: New.")
(Checkin-Time "Thu, 22 Jan 2004 21:40:26 +0100")
* src/disamb/specifier/Stop.str,
* src/disamb/namespace/NamespaceDefinition.str,
* config/check-rules.mk,
* src/disamb/classparam/Makefile.am: Fix.")
(Checkin-Time "Fri, 23 Jan 2004 20:58:50 +0100")
(Checkin-Login david_v)
(Populate-Ignore
(
......@@ -152,7 +88,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.135 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.136 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.12 644))
(README (meta-c++-grammar/g/37_README 1.7 600))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.5 644))
......@@ -447,7 +383,7 @@
(src/sdf/Makefile.am (meta-c++-grammar/g/50_Makefile.a 1.4 644))
(src/strategocxx/CxxVariables.sdf (meta-c++-grammar/g/51_CxxVariabl 1.5 644))
(src/strategocxx/StrategoCxx.sdf (meta-c++-grammar/h/0_StrategoCx 1.4 644))
(src/strategocxx/Makefile.am (meta-c++-grammar/h/1_Makefile.a 1.5 644))
(src/strategocxx/Makefile.am (meta-c++-grammar/h/1_Makefile.a 1.6 644))
(src/pp/Options.pp (meta-c++-grammar/h/2_Options.pp 1.1 644))
(src/pp/pp-dxx.str (meta-c++-grammar/h/3_pp-dxx.str 1.2 600))
(src/cxxsdf/Makefile.am (meta-c++-grammar/h/4_Makefile.a 1.2 644))
......@@ -562,11 +498,11 @@
(test/disambiguate/class-02.detcc (meta-c++-grammar/j/16_class-02.d 1.2 644))
(test/disambiguate/class-01.detcc (meta-c++-grammar/j/17_class-01.d 1.1 644))
(test/disambiguate/test.test (meta-c++-grammar/j/18_test.test 1.4 750))
(test/disambiguate/Makefile.am (meta-c++-grammar/j/19_Makefile.a 1.5 640))
(test/expressions/Makefile.am (meta-c++-grammar/j/20_Makefile.a 1.4 640))
(test/disambiguate/Makefile.am (meta-c++-grammar/j/19_Makefile.a 1.6 640))
(test/expressions/Makefile.am (meta-c++-grammar/j/20_Makefile.a 1.5 640))
(test/expressions/test.test (meta-c++-grammar/j/21_test.test 1.2 750))
(test/g++/Makefile.am (meta-c++-grammar/j/22_Makefile.a 1.1 644))
(test/g++/template/Makefile.am (meta-c++-grammar/j/23_Makefile.a 1.6 644))
(test/g++/template/Makefile.am (meta-c++-grammar/j/23_Makefile.a 1.7 644))
(test/g++/template/test.test (meta-c++-grammar/j/24_test.test 1.3 750))
(test/g++/parse/Makefile.am (meta-c++-grammar/j/25_Makefile.a 1.5 644))
(test/g++/parse/test.test (meta-c++-grammar/j/26_test.test 1.3 750))
......@@ -619,7 +555,7 @@
(src/disamb/disambiguate/NamespaceTraverse.str (meta-c++-grammar/k/21_NamespaceT 1.3 644))
(src/disamb/disambiguate/NamespaceDefinitionCandidate.str (meta-c++-grammar/k/22_NamespaceD 1.3 644))
(src/disamb/disambiguate/NamespaceDefinition.str (meta-c++-grammar/k/23_NamespaceD 1.3 644))
(src/disamb/disambiguate/Makefile.am (meta-c++-grammar/k/24_Makefile.a 1.3 640))
(src/disamb/disambiguate/Makefile.am (meta-c++-grammar/k/24_Makefile.a 1.4 640))
(src/disamb/disambiguate/afcxx-disambiguate.str (meta-c++-grammar/k/25_afcxx-disa 1.4 644))
(src/disamb/disambiguate/Lookup.str (meta-c++-grammar/k/26_Lookup.str 1.3 644))
(src/disamb/disambiguate/LocalOrGlobal.str (meta-c++-grammar/k/27_LocalOrGlo 1.3 644))
......@@ -644,7 +580,7 @@
(src/disamb/disambiguate/BaseTraverse.str (meta-c++-grammar/k/46_BaseTraver 1.4 644))
(src/disamb/disambiguate/AmbiguityCandidate.str (meta-c++-grammar/k/47_AmbiguityC 1.3 644))
(src/disamb/disambiguate/Ambiguity.str (meta-c++-grammar/k/48_Ambiguity. 1.3 644))
(src/disamb/specifier/Stop.str (meta-c++-grammar/k/49_Stop.str 1.4 644))
(src/disamb/specifier/Stop.str (meta-c++-grammar/k/49_Stop.str 1.5 644))
(src/disamb/specifier/Specifier.str (meta-c++-grammar/k/50_Specifier. 1.4 644))
(src/disamb/specifier/Makefile.am (meta-c++-grammar/k/51_Makefile.a 1.2 644))
(src/disamb/specifier/afcxx-specifier.str (meta-c++-grammar/l/0_afcxx-spec 1.2 644))
......@@ -676,7 +612,7 @@
(src/disamb/namespace/NamespaceDefinitionSelect.str (meta-c++-grammar/l/26_NamespaceD 1.2 640))
(src/disamb/namespace/NamespaceDefinitionCut.str (meta-c++-grammar/l/27_NamespaceD 1.5 640))
(src/disamb/namespace/NamespaceDefinitionCandidate.str (meta-c++-grammar/l/28_NamespaceD 1.4 640))
(src/disamb/namespace/NamespaceDefinition.str (meta-c++-grammar/l/29_NamespaceD 1.3 640))
(src/disamb/namespace/NamespaceDefinition.str (meta-c++-grammar/l/29_NamespaceD 1.4 640))
(src/disamb/namespace/NamespaceAliasDefinitionCandidate.str (meta-c++-grammar/l/30_NamespaceA 1.4 640))
(src/disamb/namespace/NamespaceAliasDefinition.str (meta-c++-grammar/l/31_NamespaceA 1.5 640))
(src/disamb/namespace/Makefile.am (meta-c++-grammar/l/32_Makefile.a 1.2 640))
......@@ -684,7 +620,7 @@
(src/parser/parse-cxx.str (meta-c++-grammar/l/34_parse-cxx. 1.4 644))
(src/parser/parse-dxx.str (meta-c++-grammar/l/35_parse-dxx. 1.5 644))
(src/parser/Makefile.am (meta-c++-grammar/l/36_Makefile.a 1.2 644))
(config/check-rules.mk (meta-c++-grammar/l/37_check-rule 1.4 640))
(config/check-rules.mk (meta-c++-grammar/l/37_check-rule 1.5 640))
(config/defs.in (meta-c++-grammar/l/38_defs.in 1.1 644))
(test/disambiguate/variable-01.detcc (meta-c++-grammar/l/39_variable-0 1.2 644))
(test/disambiguate/typedef-02.detcc (meta-c++-grammar/l/40_typedef-02 1.2 644))
......@@ -835,7 +771,7 @@
(src/disamb/simpledeclaration/afcxx-simpledeclaration.str (meta-c++-grammar/o/14_afcxx-simp 1.1 644))
(src/disamb/simpledeclaration/afcxx-simpledeclaration.meta (meta-c++-grammar/o/15_afcxx-simp 1.1 644))
(src/disamb/classparam/afcxx-classparam.meta (meta-c++-grammar/o/16_afcxx-clas 1.1 644))
(src/disamb/classparam/Makefile.am (meta-c++-grammar/o/17_Makefile.a 1.1 640))
(src/disamb/classparam/Makefile.am (meta-c++-grammar/o/17_Makefile.a 1.2 640))
(src/disamb/classparam/afcxx-classparam.str (meta-c++-grammar/o/18_afcxx-clas 1.1 644))
(src/disamb/disambiguate/PostfixExpressionAmbiguity.str (meta-c++-grammar/o/19_PostfixExp 1.1 644))
(src/disamb/disambiguate/PostfixExpressionAmbiguity.meta (meta-c++-grammar/o/20_PostfixExp 1.1 644))
......
......@@ -16,4 +16,4 @@ EXTRA_DIST = $(SRCS)
CLEANFILES = afcxx-classparam.c.dep afcxx-classparam-ast.c.dep
afcxx-classparam-ast.c: afcxx-classparam.str
$(SCOMPILE) $(STRINCLUDES) --main afcxx-simpledeclaration --verbose 0 -i $< -o $@ -c
$(SCOMPILE) $(STRINCLUDES) --main afcxx-classparam --verbose 0 -i $< -o $@ -c
......@@ -41,7 +41,6 @@ SRCS = \
ResolveCompound.str \
SimpleTypeSpecifier.str \
SimpleTypeSpecifierCandidate.str \
StatementAmbiguity.str \
TemplateArguments.str \
TemplateClassDefinition.str \
TemplateClassDefinitionCandidate.str \
......
/*
* Copyright (C) 2003 EPITA Research and Development Laboratory
* Copyright (C) 2003, 2004 EPITA Research and Development Laboratory
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -31,7 +31,7 @@ imports
strategies
namespace-definition-stop = namespace-definition-candidate-e +
namespace-definition-stop(s) = namespace-definition-candidate-e +
namespace-definition-candidate-o +
namespace-alias-definition-candidate
......
/*
* Copyright (C) 2003 EPITA Research and Development Laboratory
* Copyright (C) 2003, 2004 EPITA Research and Development Laboratory
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -28,4 +28,4 @@ rules
strategies
stop = Stop-0
stop(s) = Stop-0
......@@ -19,5 +19,6 @@ StrategoCxxGen.sdf: $(top_builddir)/src/syn/Cxx.def $(top_builddir)/src/strcxxge
EXTRA_DIST = StrategoCxx.sdf \
CxxVariables.sdf
CLEANFILES = StrategoCxx.def \
CLEANFILES = StrategoCxxGen.sdf \
StrategoCxx.def \
StrategoCxx.tbl
......@@ -81,7 +81,7 @@ TESTS = \
union-01.test \
variable-01.test
EXTRA_DIST = test.test $(TESTS:.test=.cc)
EXTRA_DIST = test.test $(TESTS:.test=.cc) $(TESTS:.test=.detcc)
CLEANFILES = defs \
dirs \
......
......@@ -36,6 +36,7 @@ TESTS = \
EXTRA_DIST = test.test $(TESTS:.test=.cc)
CLEANFILES = defs \
dirs \
$(TESTS) \
$(TESTS:.test=.visamb) \
$(TESTS:.test=.disambcc) \
......
......@@ -35,7 +35,6 @@ XFAIL_TESTS = \
qualttp16.test \
qualttp17.test \
qualttp18.test \
qualttp19.test \
qualttp1.test \
qualttp2.test \
qualttp3.test \
......
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