Commit 0c138f15 authored by david_v's avatar david_v
Browse files

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

	* src/import-cxx-cons/import-cxx-cons.str:
	Accept markups at any place.

	* src/deterministic/Dxx-nocons.sdf:
	Fix PP for OriginalNamespace, and add some bracket attributes.
parent 5c0ab786
2003-06-18 Valentin David <valentin@lrde.epita.fr>
* src/import-cxx-cons/import-cxx-cons.str:
Accept markups at any place.
* src/deterministic/Dxx-nocons.sdf:
Fix PP for OriginalNamespace, and add some bracket attributes.
2003-06-18 Clement Vasseur <vasseu_c@lrde.epita.fr>
* Makefile.am: Remove DIST_SUBDIRS.
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 115)
(Parent-Version meta-c++-grammar 0 114)
(Version-Log "from Clement Vasseur <vasseu_c@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 116)
(Parent-Version meta-c++-grammar 0 115)
(Version-Log "2003-06-18 Valentin David <valentin@lrde.epita.fr>
* Makefile.am: Remove DIST_SUBDIRS.
* config/Makefile.am, configure.ac: Remove disambiguate-check.
* config/sdf-check.in: Various cleanups.
* src/Makefile.am, src/grammar/Makefile.am,
* src/deterministic/Makefile.am, test/Makefile.am,
* src/cxxsdf/Makefile.am, src/syn/Makefile.am: Rename grammar and
signature directories to syn and sig (StrategoXT naming conventions).
* src/import-cxx-cons/Makefile.am: Add --verbose 0. Fix CLEANFILES.
* INSTALL, COPYING: New files.
* src/import-cxx-cons/import-cxx-cons.str:
Accept markups at any place.
* src/deterministic/Dxx-nocons.sdf:
Fix PP for OriginalNamespace, and add some bracket attributes.
")
(New-Version-Log "")
(Checkin-Time "Wed, 18 Jun 2003 16:58:22 +0200")
(Checkin-Login vasseu_c)
(Checkin-Time "Wed, 18 Jun 2003 18:15:49 +0200")
(Checkin-Login david_v)
(Populate-Ignore
(
;; Temporary files.
......@@ -87,7 +82,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.111 600))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.112 600))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.11 644))
(README (meta-c++-grammar/g/37_README 1.4 600))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.4 644))
......@@ -414,8 +409,8 @@
(src/cxxsdf/Makefile.am (meta-c++-grammar/h/4_Makefile.a 1.2 644))
(src/deterministic/Dxx-main.sdf (meta-c++-grammar/h/5_Dxx-main.s 1.1 600))
(src/import-cxx-cons/Makefile.am (meta-c++-grammar/h/6_Makefile.a 1.2 644))
(src/import-cxx-cons/import-cxx-cons.str (meta-c++-grammar/h/7_import-cxx 1.1 644))
(src/deterministic/Dxx-nocons.sdf (meta-c++-grammar/h/8_Dxx-nocons 1.1 600))
(src/import-cxx-cons/import-cxx-cons.str (meta-c++-grammar/h/7_import-cxx 1.2 644))
(src/deterministic/Dxx-nocons.sdf (meta-c++-grammar/h/8_Dxx-nocons 1.2 600))
(NEWS (meta-c++-grammar/h/11_NEWS 1.1 644))
(AUTHORS (meta-c++-grammar/h/12_AUTHORS 1.1 644))
(INSTALL (meta-c++-grammar/h/13_INSTALL 1.1 644))
......
......@@ -45,11 +45,11 @@ exports
"/*[uid]*/" TemplateId "/*[!uid]*/" -> UnqualifiedId { prefer, pp(H hs=0[KW["/*[uid]*/"] _1 KW["/*[!uid]*/"]]) }
"/*[qid]*/" "::" Identifier "/*[!qid]*/" -> QualifiedId { prefer, pp(H hs=0[KW["/*[qid]*/::"] _1 KW["/*[!qid]*/"]]) }
"/*[qid]*/" "::" TemplateId "/*[!qid]*/" -> QualifiedId { prefer, pp(H hs=0[KW["/*[qid]*/::"] _1 KW["/*[!qid]*/"]]) }
"/*[nns]*/" NestedNameSpecifier "/*[!nns]*/" -> NestedNameSpecifier { prefer, pp(H hs=0[KW["/*[nns]*/"] _1 KW["/*[!nns]*/"]]) }
"/*[nns]*/" NestedNameSpecifier "/*[!nns]*/" -> NestedNameSpecifier { prefer, pp(H hs=0[KW["/*[nns]*/"] _1 KW["/*[!nns]*/"]]), bracket }
%% 5.18 [expr.comma]
%% Ambiguous rules in: grammar/Expressions.sdf
"/*[expr]*/" Expression "/*[!expr]*/" -> Expression { prefer, pp(H hs=0[KW["/*[expr]*/"] _1 KW["/*[!expr]*/"]]) }
"/*[expr]*/" Expression "/*[!expr]*/" -> Expression { prefer, pp(H hs=0[KW["/*[expr]*/"] _1 KW["/*[!expr]*/"]]), bracket }
%% 7.1 [dcl.spec]
%% Ambiguous rules in: grammar/Specifiers.sdf
......@@ -64,7 +64,7 @@ exports
%% Ambiguous rules in: grammar/Namespaces.sdf
"/*[ns]*/" Identifier "/*[!ns]*/" -> OriginalNamespaceName { prefer, pp(H hs=0[KW["/*[ns]*/"] _1 KW["/*[!ns]*/"]]) }
"/*[al]*/" Identifier "/*[!al]*/" -> NamespaceAlias { prefer, pp(H hs=0[KW["/*[al]*/"] _1 KW["/*[!al]*/"]]) }
"namespace" "/*[org]*/" Identifier "/*[!org]*/" "{" NamespaceBody "}" -> OriginalNamespaceDefinition { prefer, pp(H hs=0[KW["/*[org]*/"] _1 KW["/*[!org]*/"]]) }
"namespace" "/*[org]*/" Identifier "/*[!org]*/" "{" NamespaceBody "}" -> OriginalNamespaceDefinition { prefer, pp(V [H [KW["namespace"] H hs=0[KW["/*[org]*/"] _1 KW["/*[!org]*/"]]] V is=2 [KW["{"] _2] KW["}"]]) }
%% 9 [class]
%% Ambiguous rules in: grammar/ClassSpecifiers.sdf
......
......@@ -108,7 +108,20 @@ strategies
)
delmarkup = \ [lit(_)|e] -> e \
; rec x([lit(id)]; ![] <+ [id|x])
/**
* Test if a literal is a comment
*/
iscomment = explode-string
; [47|[42|id]]
; rec x([42,47] <+ [id|x])
/**
* Delete markups.
*/
delmarkup = map(\ lit(l) -> []
where <un-double-quote> l
; iscomment \
<+ ![<id>])
; concat
at-cons(s) = oncetd(cons(s))
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