Commit 6e13cf2d authored by anisko_r's avatar anisko_r
Browse files

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

	* src/Makefile.am: Update.
	* configure.ac: Update.

	* src/deterministic/Cpp-det.sdf: New.  Introduce an annotated
        flavor of our C++ grammar, that makes deterministic parsing
        possible.
	* src/deterministic/Makefile.am: New file.
	* src/deterministic: New directory.
parent 4f3ef5f2
2002-12-04 Robert Anisko <robert@lrde.epita.fr>
* src/Makefile.am: Update.
* configure.ac: Update.
* src/deterministic/Cpp-det.sdf: New. Introduce an annotated
flavor of our C++ grammar, that makes deterministic parsing
possible.
* src/deterministic/Makefile.am: New file.
* src/deterministic: New directory.
2002-12-03 Robert Anisko <robert@lrde.epita.fr>
* configure.ac: Update.
......
......@@ -145,5 +145,5 @@ COMPILER_SYNTAX_CHECK="$CXX -ansi -pedantic -fsyntax-only"
AC_SUBST(COMPILER_SYNTAX_CHECK)
# Output Files
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/grammar/Makefile src/attribute/Makefile src/signature/Makefile test/Makefile])
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/grammar/Makefile src/deterministic/Makefile src/attribute/Makefile src/signature/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 86)
(Parent-Version meta-c++-grammar 0 85)
(Version-Log "2002-12-03 Robert Anisko <robert@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 87)
(Parent-Version meta-c++-grammar 0 86)
(Version-Log "2002-12-04 Robert Anisko <robert@lrde.epita.fr>
* src/Makefile.am: Update.
* configure.ac: Update.
* src/Makefile.am (SUBDIRS): Update.
* test/Makefile.am: Remove disambiguation tests.
* src/disambiguate: Remove directory. This filter is obsolete.")
* src/deterministic/Cpp-det.sdf: New. Introduce an annotated
flavor of our C++ grammar, that makes deterministic parsing
possible.
* src/deterministic/Makefile.am: New file.
* src/deterministic: New directory.")
(New-Version-Log "")
(Checkin-Time "Tue, 03 Dec 2002 18:10:59 +0100")
(Checkin-Time "Wed, 04 Dec 2002 17:51:28 +0100")
(Checkin-Login anisko_r)
(Populate-Ignore
(
......@@ -82,7 +86,7 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.83 640))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.84 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))
......@@ -92,7 +96,7 @@
(config/disambiguate-check.in (meta-c++-grammar/f/38_disambigua 1.6 640))
(config/sdf-check.in (meta-c++-grammar/f/37_sdf-check. 1.3 640))
(config/xt-rules.mk (meta-c++-grammar/f/35_xt-rules.m 1.6 640))
(configure.ac (meta-c++-grammar/f/44_configure. 1.10 640))
(configure.ac (meta-c++-grammar/f/44_configure. 1.11 640))
(lib/Layout.sdf (meta-c++-grammar/4_Layout.sdf 1.2 640))
(lib/Makefile.am (meta-c++-grammar/f/49_Makefile.a 1.2 640))
......@@ -105,7 +109,7 @@
(prj (meta-c++-grammar.prj) :symlink)
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.5 640))
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.6 640))
(src/attribute/Makefile.am (meta-c++-grammar/g/31_Makefile.a 1.2 640))
(src/attribute/Main.r (meta-c++-grammar/g/32_Main.r 1.1 640))
......@@ -119,7 +123,7 @@
(src/grammar/CastExpressions.sdf (meta-c++-grammar/12_CastExpres 1.5 640))
(src/grammar/CharacterLiterals.sdf (meta-c++-grammar/13_CharacterL 1.3 640))
(src/grammar/Characters.sdf (meta-c++-grammar/14_Characters 1.2 640))
(src/grammar/ClassSpecifiers.sdf (meta-c++-grammar/15_ClassSpeci 1.5 640))
(src/grammar/ClassSpecifiers.sdf (meta-c++-grammar/15_ClassSpeci 1.6 640))
(src/grammar/CompoundStatements.sdf (meta-c++-grammar/16_CompoundSt 1.4 640))
(src/grammar/ConditionalExpressions.sdf (meta-c++-grammar/17_Conditiona 1.4 640))
(src/grammar/ConstantExpressions.sdf (meta-c++-grammar/18_ConstantEx 1.2 640))
......@@ -189,6 +193,9 @@
(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.1 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))
(test/g++/abi/bitfield1.C (meta-c++-grammar/b/30_bitfield1. 1.1 640))
(test/g++/abi/bitfield2.C (meta-c++-grammar/b/31_bitfield2. 1.1 640))
......
SUBDIRS = grammar signature attribute
SUBDIRS = grammar deterministic signature attribute
module Deterministic
imports
Cpp
exports
context-free syntax
%% Introduce specific comments that will act as source code
%% annotations. Of course, they should not be parsed as layout.
"/*[ al ]*/" -> LAYOUT { reject } %% NamespaceAlias
"/*[ cl ]*/" -> LAYOUT { reject } %% ClassName
"/*[ ns ]*/" -> LAYOUT { reject } %% OriginalNamespaceName
"/*[ nns ]*/" -> LAYOUT { reject } %% NestedNameSpecifier
"/*[ uid ]*/" -> LAYOUT { reject } %% UnqualifiedId
"/*[ qid ]*/" -> LAYOUT { reject } %% QualifiedId
"/*[ !al ]*/" -> LAYOUT { reject }
"/*[ !cl ]*/" -> LAYOUT { reject }
"/*[ !ns ]*/" -> LAYOUT { reject }
"/*[ !nns ]*/" -> LAYOUT { reject }
"/*[ !uid ]*/" -> LAYOUT { reject }
"/*[ !qui ]*/" -> LAYOUT { reject }
%% 5.1 [expr.prim]
%% Ambiguous rules in: grammar/IdExpressions.sdf
"/*[ uid ]*/" Identifier "/*[ !uid ]*/" -> UnqualifiedId
"/*[ uid ]*/" TemplateId "/*[ !uid ]*/" -> UnqualifiedId
"/*[ qid ]*/" "::" Identifier "/*[ !qid ]*/" -> QualifiedId
"/*[ qid ]*/" "::" TemplateId "/*[ !qid ]*/" -> QualifiedId
"/*[ nns ]*/" NestedNameSpecifier "/*[ !nns ]*/" -> NestedNameSpecifier
%% 7.3.1 [namespace.def]
%% Ambiguous rules in: grammar/Namespaces.sdf
"/*[ ns ]*/" Identifier "/*[ !ns ]*/" -> OriginalNamespaceName
"/*[ al ]*/" Identifier "/*[ !al ]*/" -> NamespaceAlias
%% 9 [class]
%% Ambiguous rules in: grammar/ClassSpecifiers.sdf
"/*[ cl ]*/" Identifier "/*[ !cl ]*/" -> ClassName
"/*[ cl ]*/" TemplateId "/*[ !cl ]*/" -> ClassName
# xt rules
include $(top_srcdir)/config/xt-rules.mk
pkgdata_DATA = Cpp-det.cdef Cpp-det.cadef Cpp-det.tbl Cpp-det.pp
EXTRA_DIST = $(SDFS)
SDFS = \
Cpp-det.sdf
Cpp-det.def : $(SDFS)
$(PACK_SDF) -I $(top_srcdir)/lib -I $(top_srcdir)/src/grammar -i Cpp-det.sdf \
| $(IMPLODE_ASFIX) \
| $(SDF_OPTION) \
| $(SDF_BRACKET) \
| $(PP) -a -l sdf -v 2.1 > $@
CLEANFILES = Cpp-det.def Cpp-det.cdef Cpp-det.cadef Cpp-det.tbl Cpp-det.pp
......@@ -20,7 +20,7 @@ exports
context-free syntax
%% 9 [class]
Identifier -> ClassName
Identifier -> ClassName
TemplateId -> ClassName
%% 9 [class]
......
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