Commit 81b9d8da authored by anisko_r's avatar anisko_r
Browse files

2002-12-20 Robert Anisko <robert@lrde.epita.fr>

	* src/deterministic/Cpp-det.sdf: Add a rule to be able to annotate
	original definitions of namespaces.

	* src/cpp-to-det/Main.r: Update with respect to this new rule.
	* src/det-to-cpp/Main.r: Update with respect to this new rule.
parent 832b55ad
2002-12-20 Robert Anisko <robert@lrde.epita.fr>
* src/deterministic/Cpp-det.sdf: Add a rule to be able to annotate
original definitions of namespaces.
* src/cpp-to-det/Main.r: Update with respect to this new rule.
* src/det-to-cpp/Main.r: Update with respect to this new rule.
2002-12-10 Robert Anisko <robert@lrde.epita.fr>
* src/Makefile.am (SUBDIRS): Update.
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 95)
(Parent-Version meta-c++-grammar 0 94)
(Version-Log "2002-12-10 Robert Anisko <robert@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 96)
(Parent-Version meta-c++-grammar 0 95)
(Version-Log "2002-12-20 Robert Anisko <robert@lrde.epita.fr>
* src/Makefile.am (SUBDIRS): Update.
* configure.ac: Update.
* src/deterministic/Cpp-det.sdf: Add a rule to be able to annotate
original definitions of namespaces.
* src/cpp-to-det/Main.r: New file. Provide a filter that converts
C++ abstract syntax trees into deterministic C++.
* src/cpp-to-det/Makefile.am: New file.
* src/cpp-to-det: New directory.")
* src/cpp-to-det/Main.r: Update with respect to this new rule.
* src/det-to-cpp/Main.r: Update with respect to this new rule.")
(New-Version-Log "")
(Checkin-Time "Tue, 10 Dec 2002 18:31:20 +0100")
(Checkin-Time "Fri, 20 Dec 2002 21:51:22 +0100")
(Checkin-Login anisko_r)
(Populate-Ignore
(
......@@ -85,7 +83,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.92 640))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.93 640))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.2 640))
(TODO (meta-c++-grammar/f/27_TODO 1.2 640))
(README (meta-c++-grammar/g/37_README 1.1 644))
......@@ -192,7 +190,7 @@
(src/grammar/UsingDeclarations.sdf (meta-c++-grammar/b/28_UsingDecla 1.4 640))
(src/grammar/UsingDirectives.sdf (meta-c++-grammar/b/29_UsingDirec 1.5 640))
(src/deterministic/Cpp-det.sdf (meta-c++-grammar/g/38_Cpp-det.sd 1.5 644))
(src/deterministic/Cpp-det.sdf (meta-c++-grammar/g/38_Cpp-det.sd 1.6 644))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.1 644))
(test/Makefile.am (meta-c++-grammar/f/45_Makefile.a 1.3 640))
......@@ -424,10 +422,10 @@
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.3 640))
(src/det-to-cpp/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.1 644))
(src/det-to-cpp/Main.r (meta-c++-grammar/g/41_Main.r 1.1 644))
(src/det-to-cpp/Main.r (meta-c++-grammar/g/41_Main.r 1.2 644))
(src/cpp-to-det/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.1 644))
(src/cpp-to-det/Main.r (meta-c++-grammar/g/43_Main.r 1.1 644))
(src/cpp-to-det/Main.r (meta-c++-grammar/g/43_Main.r 1.2 644))
(lib/stratego.pp.af (meta-c++-grammar/g/34_stratego.p 1.1 640))
(lib/stratego.pp (meta-c++-grammar/g/35_stratego.p 1.1 640))
......
......@@ -28,6 +28,7 @@ rules
Namespace-Def-0 : Identifier (x) -> Identifier14 (x)
Namespace-Def-1 : Identifier1 (x) -> Identifier15 (x)
Namespace-Def-2 : namespace (x, y) -> namespace4 (x, y)
Class-0 : Identifier9 (x) -> Identifier16 (x)
Class-1 : TemplateId2 (x) -> TemplateId5 (x)
......
......@@ -29,6 +29,7 @@ rules
Namespace-Def-0 : Identifier14 (x) -> Identifier (x)
Namespace-Def-1 : Identifier15 (x) -> Identifier1 (x)
Namespace-Def-2 : namespace4 (x, y) -> namespace (x, y)
Class-0 : Identifier16 (x) -> Identifier9 (x)
Class-1 : TemplateId5 (x) -> TemplateId2 (x)
......@@ -40,7 +41,7 @@ strategies
expr-prim = Expr-Prim-0 + Expr-Prim-1 + Expr-Prim-2 + Expr-Prim-3 + Expr-Prim-4
dcl-spec = Dcl-Spec-0
dcl-enum = Dcl-Enum-0 + Dcl-Enum-1
namespace-def = Namespace-Def-0 + Namespace-Def-1
namespace-def = Namespace-Def-0 + Namespace-Def-1 + Namespace-Def-2
class = Class-0 + Class-1
gram-key = Gram-Key-0
......
......@@ -23,6 +23,7 @@ exports
"/*[nns]*/" -> LAYOUT { reject } %% NestedNameSpecifier
"/*[uid]*/" -> LAYOUT { reject } %% UnqualifiedId
"/*[qid]*/" -> LAYOUT { reject } %% QualifiedId
"/*[org]*/" -> LAYOUT { reject } %% OriginalNamespaceDefinition
"/*[etor]*/" -> LAYOUT { reject } %% Enumerator
"/*[!al]*/" -> LAYOUT { reject }
"/*[!cl]*/" -> LAYOUT { reject }
......@@ -33,6 +34,7 @@ exports
"/*[!nns]*/" -> LAYOUT { reject }
"/*[!uid]*/" -> LAYOUT { reject }
"/*[!qui]*/" -> LAYOUT { reject }
"/*[!org]*/" -> LAYOUT { reject }
"/*[!etor]*/" -> LAYOUT { reject }
%% 5.1 [expr.prim]
......@@ -56,6 +58,7 @@ exports
%% Ambiguous rules in: grammar/Namespaces.sdf
"/*[ns]*/" Identifier "/*[!ns]*/" -> OriginalNamespaceName { prefer }
"/*[al]*/" Identifier "/*[!al]*/" -> NamespaceAlias { prefer }
"namespace" "/*[org]*/" Identifier "/*[!org]*/" "{" NamespaceBody "}" -> OriginalNamespaceDefinition { prefer }
%% 9 [class]
%% Ambiguous rules in: grammar/ClassSpecifiers.sdf
......
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