Commit fef5c2c9 authored by vasseu_c's avatar vasseu_c
Browse files

2003-03-25 Clement Vasseur <vasseu_c@lrde.epita.fr>

        * src/attribute/Main.r, src/cpp-to-det/Main.r, src/det-to-cpp/Main.r:
        Rename as...
        * src/attribute/asfix-attribute.str, src/cpp-to-det/cpp-to-det.str,
        * src/det-to-cpp/det-to-cpp.str:
        ...these, and rename `main' strategy.

        * Makefile.am, lib/Makefile.am, src/Makefile.am,
        * src/attribute/Makefile.am, src/grammar/Makefile.am,
        * src/deterministic/Makefile.am, src/cpp-to-det/Makefile.am,
        * src/det-to-cpp/Makefile.am, src/signature/Makefile.am:
        Use Makefile.xt from autoxt, remove useless rules, modifify to work
        with standard StrategoXT rules.

        * config/Makefile.am: Add `depcomp' to STANDARD_TOOLS list.
        * configure.ac: Use USE_XT_PACKAGES macro from autoxt.
        * stdconfig, bootstrap: Add, from sample StrategoXT package.
        * README: Fix a typo.
parent 49d949be
2003-03-25 Clement Vasseur <vasseu_c@lrde.epita.fr>
* src/attribute/Main.r, src/cpp-to-det/Main.r, src/det-to-cpp/Main.r:
Rename as...
* src/attribute/asfix-attribute.str, src/cpp-to-det/cpp-to-det.str,
* src/det-to-cpp/det-to-cpp.str:
...these, and rename `main' strategy.
* Makefile.am, lib/Makefile.am, src/Makefile.am,
* src/attribute/Makefile.am, src/grammar/Makefile.am,
* src/deterministic/Makefile.am, src/cpp-to-det/Makefile.am,
* src/det-to-cpp/Makefile.am, src/signature/Makefile.am:
Use Makefile.xt from autoxt, remove useless rules, modifify to work
with standard StrategoXT rules.
* config/Makefile.am: Add `depcomp' to STANDARD_TOOLS list.
* configure.ac: Use USE_XT_PACKAGES macro from autoxt.
* stdconfig, bootstrap: Add, from sample StrategoXT package.
* README: Fix a typo.
2003-01-03 Robert Anisko <robert@lrde.epita.fr>
* lib/Layout.sdf: Add the right follow restrictions on layout, to
......
include config/xt-rules.mk ## so that we can build test targets at the root
SUBDIRS = config src lib test
EXTRA_DIST = stdconfig bootstrap Makefile.xt
include Makefile.xt
In addition to XT, this package requires sdf-options, part of the
meta-sdf-options PRCS project.
In addition to XT, this package requires sdf-option, part of the
meta-sdf-option PRCS project.
......@@ -10,7 +10,5 @@ $(STANDARD_TOOLS)
STANDARD_TOOLS = \
install-sh \
missing \
mkinstalldirs
EXTRA_DIST = \
xt-rules.mk
mkinstalldirs \
depcomp
## -*-Makefile-*-
##
## common generic rules
##
## Remember that all the following rules should have a 'dest : src' single dependency.
SUFFIXES = \
.r \
.pp \
.tbl \
.def .adef \
.cdef .cadef .bcadef \
.rdef .ardef \
.abox \
.cc .acc .dot
## Constructor generation
.def.adef:
$(PARSE) -l sdf -v 2.1 -i $< -o $@ -I
.adef.cadef:
$(SDF_CONS) -i $< -o $@
.cadef.bcadef:
$(SDF_BRACKET) -i $< -o $@
.bcadef.cdef:
$(PP) -a -l sdf -v 2.1 -i $< -o $@
## Parse table generation
.cdef.tbl:
$(SDF2TABLE) -l -v -i $< -o $@ -m $(basename $< .cdef)
## Stratego signature generation
STRATEGOPP=$(top_srcdir)/lib/stratego.pp
SDFTBL=$(top_srcdir)/lib/sdf.cons.tbl
.cadef.ardef:
$(SDF2SIG) -i $< -o $@
.ardef.abox:
$(AST2ABOX) -p $(STRATEGOPP) -i $< -o $@
.abox.rdef:
$(ABOX2TEXT) -i $< -o $@
.rdef.r:
$(UNPACK) $< r
## Pretty printer table generation
.cadef.pp:
$(PPGEN) -a -i $< -o $@
## Parse Trees generation
CXXTBL=$(top_builddir)/src/grammar/Cpp.tbl
.cc.acc:
$(SGLR) -fi -p $(CXXTBL) -i $< -o $@
.acc.dot:
$(TREE2DOT) -i $< -o $@
......@@ -15,73 +15,14 @@ AC_INIT(cpp-grammar, 0.1)
# Auxiliary files
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_FILES(config/Makefile)
AC_CONFIG_FILES([config/sdf-check], [chmod +x config/sdf-check])
AC_CONFIG_FILES([config/sdf-check],
[chmod +x config/sdf-check])
AC_CONFIG_FILES([config/disambiguate-check],
[chmod +x config/disambiguate-check])
AM_INIT_AUTOMAKE([foreign 1.6 dist-bzip2])
# Command line specified pathes
AC_ARG_WITH(xt,
[ --with-xt=XT_PATH Specify location of XT ],
XT_PATH="$withval",
XT_PATH=""
)
AC_SUBST(XT_PATH)
AC_ARG_WITH(stratego,
[ --with-stratego=DIR Specify location of Stratego [XT_PATH]],
STRATEGO_PATH="$withval",
STRATEGO_PATH="$XT_PATH"
)
AC_SUBST(STRATEGO_PATH)
AC_ARG_WITH(sglr,
[ --with-sglr=DIR Specify location of SGLR, [XT_PATH]],
SGLR_PATH="$withval",
SGLR_PATH="$XT_PATH"
)
AC_SUBST(SGLR_PATH)
AC_ARG_WITH(asfix-tools,
[ --with-asfix-tools=DIR Specify location of ASFIX-TOOLS, [XT_PATH]],
ASFIX_TOOLS_PATH="$withval",
ASFIX_TOOLS_PATH="$XT_PATH"
)
AC_SUBST(ASFIX_TOOLS_PATH)
AC_ARG_WITH(stratego-tools,
[ --with-stratego-tools=DIR Specify location of STRATEGO-TOOLS, [XT_PATH]],
STRATEGO_TOOLS_PATH="$withval",
STRATEGO_TOOLS_PATH="$XT_PATH"
)
AC_SUBST(STRATEGO_TOOLS_PATH)
AC_ARG_WITH(sdf-tools,
[ --with-sdf-tools=DIR Specify location of SDF-TOOLS, [XT_PATH]],
SDF_TOOLS_PATH="$withval",
SDF_TOOLS_PATH="$XT_PATH"
)
AC_SUBST(SDF_TOOLS_PATH)
AC_ARG_WITH(gpp,
[ --with-gpp=DIR Specify location of GPP, [XT_PATH]],
GPP_PATH="$withval",
GPP_PATH="$XT_PATH"
)
AC_SUBST(GPP_PATH)
AC_ARG_WITH(gb,
[ --with-gb=DIR Specify location of GB, [XT_PATH]],
GB_PATH="$withval",
GB_PATH="$XT_PATH"
)
AC_SUBST(GB_PATH)
AC_ARG_WITH(graphviz,
[ --with-graphviz=DIR Specify location of GRAPHVIZ, [XT_PATH]],
GRAPHVIZ_PATH="$withval",
GRAPHVIZ="$XT_PATH"
)
AC_SUBST(GRAPHVIZ_PATH)
USE_XT_PACKAGES
AC_ARG_WITH(transformers,
[ --with-transformers=DIR Specify location of TRANSFORMERS, []],
......@@ -92,44 +33,6 @@ AC_SUBST(TRANSFORMERS_PATH)
# Look for specific programs
# variables are AC_SUBSTed to work around an autoconf bug (corrected in CVS version)
AC_PATH_XPROG([SC], [sc], [STRATEGO_PATH])
AC_SUBST([SC])
AC_PATH_XPROG([PACK_SDF], [pack-sdf], [XT_PATH])
AC_SUBST([PACK_SDF])
AC_PATH_XPROG([ASFIX_YIELD], [asfix-yield], [XT_PATH])
AC_SUBST([ASFIX_YIELD])
AC_PATH_XPROG([SGLR], [sglr], [SGLR_PATH])
AC_SUBST([SGLR])
AC_PATH_XPROG([SDF2TABLE], [sdf2table], [XT_PATH])
AC_SUBST([SDF2TABLE])
AC_PATH_XPROG([UNPARSEPT], [unparsePT], [XT_PATH])
AC_SUBST([UNPARSEPT])
AC_PATH_XPROG([IMPLODE_ASFIX], [implode-asfix], [ASFIX_TOOLS_PATH])
AC_SUBST([IMPLODE_ASFIX])
AC_PATH_XPROG([ABOX2TEXT], [abox2text], [GPP_PATH])
AC_SUBST([ABOX2TEXT])
AC_PATH_XPROG([PPGEN], [ppgen], [GPP_PATH])
AC_SUBST([PPGEN])
AC_PATH_XPROG([PP], [pp], [GPP_PATH])
AC_SUBST([PP])
AC_PATH_XPROG([AST2ABOX], [ast2abox], [GPP_PATH])
AC_SUBST([AST2ABOX])
AC_PATH_XPROG([PARSE], [parse], [GB_PATH])
AC_SUBST([PARSE])
AC_PATH_XPROG([UNPACK], [unpack], [SDF_TOOLS_PATH])
AC_SUBST([UNPACK])
AC_PATH_XPROG([SDF2SIG], [sdf2sig], [STRATEGO_TOOLS_PATH])
AC_SUBST([SDF2SIG])
AC_PATH_XPROG([SDF_CONS], [sdf-cons], [SDF_TOOLS_PATH])
AC_SUBST([SDF_CONS])
AC_PATH_XPROG([RM_CONS], [rm-cons], [XT_PATH])
AC_SUBST([RM_CONS])
AC_PATH_XPROG([SDF_BRACKET], [sdf-bracket], [SDF_TOOLS_PATH])
AC_SUBST([SDF_BRACKET])
AC_PATH_XPROG([TREE2DOT], [tree2dot], [XT_PATH])
AC_SUBST([TREE2DOT])
AC_PATH_XPROG([DOTTY], [dotty], [GRAPHVIZ_PATH])
AC_SUBST([DOTTY])
AC_PATH_XPROG([SDF_OPTION], [sdf-option], [TRANSFORMERS_PATH])
AC_SUBST([SDF_OPTION])
......
......@@ -5,3 +5,5 @@ prelude \
stratego.pp \
stratego.pp.af \
sdf.cons.tbl
include $(top_srcdir)/Makefile.xt
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 98)
(Parent-Version meta-c++-grammar 0 97)
(Version-Log "2003-01-03 Robert Anisko <robert@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 99)
(Parent-Version meta-c++-grammar 0 98)
(Version-Log "2003-03-25 Clement Vasseur <vasseu_c@lrde.epita.fr>
* lib/Layout.sdf: Add the right follow restrictions on layout, to
avoid weird parsing ambiguities when using comments.")
* src/attribute/Main.r, src/cpp-to-det/Main.r, src/det-to-cpp/Main.r:
Rename as...
* src/attribute/asfix-attribute.str, src/cpp-to-det/cpp-to-det.str,
* src/det-to-cpp/det-to-cpp.str:
...these, and rename `main' strategy.
* Makefile.am, lib/Makefile.am, src/Makefile.am,
* src/attribute/Makefile.am, src/grammar/Makefile.am,
* src/deterministic/Makefile.am, src/cpp-to-det/Makefile.am,
* src/det-to-cpp/Makefile.am, src/signature/Makefile.am:
Use Makefile.xt from autoxt, remove useless rules, modifify to work
with standard StrategoXT rules.
* config/Makefile.am: Add `depcomp' to STANDARD_TOOLS list.
* configure.ac: Use USE_XT_PACKAGES macro from autoxt.
* stdconfig, bootstrap: Add, from sample StrategoXT package.
* README: Fix a typo.
")
(New-Version-Log "")
(Checkin-Time "Fri, 03 Jan 2003 21:45:45 +0100")
(Checkin-Login anisko_r)
(Checkin-Time "Tue, 25 Mar 2003 06:30:29 +0100")
(Checkin-Login vasseu_c)
(Populate-Ignore
(
;; Temporary files.
......@@ -80,32 +96,31 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.95 640))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.2 640))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.96 640))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.3 640))
(TODO (meta-c++-grammar/f/27_TODO 1.2 640))
(README (meta-c++-grammar/g/37_README 1.1 644))
(README (meta-c++-grammar/g/37_README 1.2 644))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.1 640))
(config/Makefile.am (meta-c++-grammar/f/40_Makefile.a 1.2 640))
(config/ccview.sh (meta-c++-grammar/f/36_ccview.sh 1.1 750))
(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.13 640))
(configure.ac (meta-c++-grammar/f/44_configure. 1.14 640))
(lib/Layout.sdf (meta-c++-grammar/4_Layout.sdf 1.3 640))
(lib/Makefile.am (meta-c++-grammar/f/49_Makefile.a 1.2 640))
(lib/asfix/AsFixAttributes.r (meta-c++-grammar/f/0_AsFixAttri 1.1 640))
(lib/asfix/AsFixProductions.r (meta-c++-grammar/f/1_AsFixProdu 1.1 640))
(lib/asfix/AsFixSorts.r (meta-c++-grammar/f/2_AsFixSorts 1.1 640))
(lib/asfix/AsFixTerms.r (meta-c++-grammar/f/3_AsFixTerms 1.1 640))
(lib/asfix/AsFixTrees.r (meta-c++-grammar/f/4_AsFixTrees 1.1 640))
(lib/prelude/Booleans.r (meta-c++-grammar/f/5_Booleans.r 1.1 640))
(lib/Makefile.am (meta-c++-grammar/f/49_Makefile.a 1.3 640))
(lib/asfix/AsFixAttributes.str (meta-c++-grammar/f/0_AsFixAttri 1.1 640))
(lib/asfix/AsFixProductions.str (meta-c++-grammar/f/1_AsFixProdu 1.1 640))
(lib/asfix/AsFixSorts.str (meta-c++-grammar/f/2_AsFixSorts 1.1 640))
(lib/asfix/AsFixTerms.str (meta-c++-grammar/f/3_AsFixTerms 1.1 640))
(lib/asfix/AsFixTrees.str (meta-c++-grammar/f/4_AsFixTrees 1.1 640))
(lib/prelude/Booleans.str (meta-c++-grammar/f/5_Booleans.r 1.1 640))
(prj (meta-c++-grammar.prj) :symlink)
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.8 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))
(src/Makefile.am (meta-c++-grammar/f/46_Makefile.a 1.9 640))
(src/attribute/Makefile.am (meta-c++-grammar/g/31_Makefile.a 1.3 640))
(src/attribute/asfix-attribute.str (meta-c++-grammar/g/32_Main.r 1.2 640))
(src/grammar/AccessSpecifiers.sdf (meta-c++-grammar/5_AccessSpec 1.4 640))
(src/grammar/AdditiveExpressions.sdf (meta-c++-grammar/6_AdditiveEx 1.6 640))
......@@ -156,7 +171,7 @@
(src/grammar/Literals.sdf (meta-c++-grammar/50_Literals.s 1.3 640))
(src/grammar/LogicalAndExpressions.sdf (meta-c++-grammar/51_LogicalAnd 1.4 640))
(src/grammar/LogicalOrExpressions.sdf (meta-c++-grammar/b/0_LogicalOrE 1.4 640))
(src/grammar/Makefile.am (meta-c++-grammar/f/47_Makefile.a 1.9 640))
(src/grammar/Makefile.am (meta-c++-grammar/f/47_Makefile.a 1.10 640))
(src/grammar/MemberSpecifications.sdf (meta-c++-grammar/b/1_MemberSpec 1.6 640))
(src/grammar/MultiplicativeExpressions.sdf (meta-c++-grammar/b/2_Multiplica 1.5 640))
(src/grammar/NamespaceAliases.sdf (meta-c++-grammar/b/3_NamespaceA 1.4 640))
......@@ -188,7 +203,7 @@
(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.7 644))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.1 644))
(src/deterministic/Makefile.am (meta-c++-grammar/g/39_Makefile.a 1.2 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))
......@@ -416,13 +431,13 @@
(test/our/expressions/primary-par.cc (meta-c++-grammar/e/45_primary-pa 1.1 640))
(test/our/expressions/primary-this.cc (meta-c++-grammar/e/46_primary-th 1.1 640))
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.3 640))
(src/signature/Makefile.am (meta-c++-grammar/g/33_Makefile.a 1.4 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.3 644))
(src/det-to-cpp/Makefile.am (meta-c++-grammar/g/40_Makefile.a 1.2 644))
(src/det-to-cpp/det-to-cpp.str (meta-c++-grammar/g/41_Main.r 1.4 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.3 644))
(src/cpp-to-det/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.2 644))
(src/cpp-to-det/cpp-to-det.str (meta-c++-grammar/g/43_Main.r 1.4 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))
......
SUBDIRS = grammar deterministic signature attribute det-to-cpp cpp-to-det
include $(top_srcdir)/Makefile.xt
# xt rules
include $(top_srcdir)/config/xt-rules.mk
include $(top_srcdir)/Makefile.xt
bin_SCRIPTS = asfix-attribute
SCFLAGS = --main $* --verbose 0 $(XTCFLAGS) \
-I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/lib/asfix
SRCS = Main.r
bin_PROGRAMS = asfix-attribute
asfix-attribute : $(SRCS)
@SC@ -I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/lib/asfix \
-I $(top_srcdir)/src/attribute \
-i Main.r \
-o asfix-attribute
asfix-attribute.o: xtc-conf.h
EXTRA_DIST = $(SRCS)
BOOTCLEANFILES = asfix-attribute.c
CLEANFILES = asfix-attribute *.c *.dep *.tree
EXTRA_DIST = asfix-attribute.str
CLEANFILES = $(wildcard *.dep) \
$(wildcard *.atree) \
$(wildcard *.mtree) \
$(wildcard *.txt) \
$(wildcard *.af) \
$(wildcard *.afexp) \
$(wildcard *.aexp) \
$(wildcard *.abox)
module Main
module asfix-attribute
imports
......@@ -14,4 +14,4 @@ rules
strategies
main = iowrap (bottomup (try (Attribute)))
asfix-attribute = iowrap (bottomup (try (Attribute)))
# xt rules
include $(top_srcdir)/config/xt-rules.mk
include $(top_srcdir)/Makefile.xt
bin_SCRIPTS = cpp-to-det
SCFLAGS = --main $* --verbose 0 $(XTCFLAGS) \
-I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature
SRCS = Main.r
bin_PROGRAMS = cpp-to-det
cpp-to-det : $(SRCS)
@SC@ -I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature \
-I $(top_srcdir)/src/cpp-to-det \
-i Main.r \
-o cpp-to-det
cpp-to-det.o : xtc-conf.h
EXTRA_DIST = $(SRCS)
BOOTCLEANFILES = cpp-to-det.c
CLEANFILES = cpp-to-det *.c *.dep *.tree
EXTRA_DIST = cpp-to-det.str
CLEANFILES = $(wildcard *.dep) \
$(wildcard *.atree) \
$(wildcard *.mtree) \
$(wildcard *.txt) \
$(wildcard *.af) \
$(wildcard *.afexp) \
$(wildcard *.aexp) \
$(wildcard *.abox)
module Main
module cpp-to-det
imports
......@@ -49,5 +49,6 @@ strategies
strategies
cpp-to-det = expr-prim + dcl-spec + dcl-enum + namespace-def + class + gram-key + expr
main = iowrap (topdown (try (cpp-to-det)))
Cpp-to-det = expr-prim + dcl-spec + dcl-enum + namespace-def + class +
gram-key + expr
cpp-to-det = iowrap (topdown (try (Cpp-to-det)))
# xt rules
include $(top_srcdir)/config/xt-rules.mk
include $(top_srcdir)/Makefile.xt
bin_SCRIPTS = det-to-cpp
SCFLAGS = --main $* --verbose 0 $(XTCFLAGS) \
-I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature
SRCS = Main.r
bin_PROGRAMS = det-to-cpp
det-to-cpp : $(SRCS)
@SC@ -I $(top_srcdir)/lib/prelude \
-I $(top_srcdir)/src/signature \
-I $(top_srcdir)/src/det-to-cpp \
-i Main.r \
-o det-to-cpp
det-to-cpp.o : xtc-conf.h
EXTRA_DIST = $(SRCS)
BOOTCLEANFILES = det-to-cpp.c
CLEANFILES = det-to-cpp *.c *.dep *.tree
EXTRA_DIST = det-to-cpp.str
CLEANFILES = $(wildcard *.dep) \
$(wildcard *.atree) \
$(wildcard *.mtree) \
$(wildcard *.txt) \
$(wildcard *.af) \
$(wildcard *.afexp) \
$(wildcard *.aexp) \
$(wildcard *.abox)
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