* README: New file.
	* AUTHORS: New file.
	* INSTALL: New file.

	* configure.ac: many deleted directories, and maintener mail added

	* lib/sdf-cons,
	* src/pack-boxed2pp-table,
	* src/pack-boxed2sdf: Deleted directories (unused).

	* test/inst.sh: Deleted file.
	* test/defs.in:
	XTC problem resolved. No make install any more for test ;)

	* src/pack-boxedsdf/pack-boxedsdf.str,
	* src/parser/parse-boxedsdf.str,
	* src/pp/pp-boxedsdf.str,
	* src/boxed2sdf/boxed2sdf.str,
	* src/boxed2pp-table/boxed2pp-table.str: Comments added.

	* src/pack-boxedsdf/pack-boxedsdf:
	Can now use .ppsdf extension.

	* src/parser: New directory.
	* src/parser/parse-boxedsdf.str: New file.

        * src/boxedsdf-merge/boxedsdf-merge.str:
        ability to load .pp.af files added

	* src/boxedsdf-merge/boxedsdf-merge.str: debug deleted

	* src/boxedsdf-merge/boxedsdf-merge.str: bugfix (autogeneration test)

        * src/boxed2pp-table/boxed2pp-table.str: bug fix (conc-grammars)

	* test/simple.test: deleted.
	* test/2pp.test: new file.
	* test/2sdf.test: new file.
	* test/merge.test: new file.
	* test/merge.pp: new file.
	* test/merge.sdf: new file.
	* test/inst.sh: new file.

	* test/defs.in: merge added.
	* test/Makefile.am: new tests.

	* src/boxedsdf-merge/Makefile.am,
	* src/boxedsdf-merge/boxedsdf-merge.str:
	Do not display out useless PP entries any more.

	* src/boxedsdf-merge: new directory.
	* src/boxedsdf-merge/Makefile.am: new file.
	* src/boxedsdf-merge/boxedsdf-merge.str: new file.

	* src/Makefile.am,
	* configure.ac: src/boxedsdf-merge directory added.

	* src/pp: new directory.
	* src/pp/Makefile.am: new file.
	* src/pp/BoxedSdf2-pretty.pp: new file.
	* src/pp/pp-boxedsdf.str: new file.

	* src/Makefile.am,
	* configure.ac: pp directory added

	* src/syn/BoxedSdf2.sdf: changed grammar, now pp entries in attributes

	* src/boxed2sdf/boxed2sdf.str,
	* src/boxed2pp-table/boxed2pp-table.str,
	* src/pack-boxed2pp-table/pack-boxed2pp-table.str:
	tools upgrades for new grammar

	* test/simple.sdf,
	* test/inclusion.sdf,
	* test/defs.in: new grammar using

	* test/simple.test: bug correction

        * lib/ppgen: new directory.
        * lib/ppgen/Makefile.am: new file
        * lib/ppgen/sdf-2-pp-lib.str: new file.
        * lib/Makefile.am, configure.ac: added the new lib directory
		
        * src/boxed2pp-table/boxed2pp-table.str: now use ppgen to generate
        trivials pp rules.
        * src/boxed2pp-table/Makefile.am: new inclusion directories.

	* src/disamb/Makefile.am, src/disamb/bs-disamb.str: deleted
	* src/disamb: deleted directory
	* src/Makefile.am: SUBDIRS correction

	* src/syn/Makefile.am, src/syn/BoxedSdf2.sdf: use renamings for cleaner
	grammar merging
	* src/syn/unrename.sh: new file, used because of implode-asfix problem
	with sdf-to-sig tool

	* src/pack-boxedsdf/pack-boxedsdf.str, src/boxed2pp-table.str:
	changes because of changes in the grammar

	* src/pack-boxed2pp-table.str, src/pack-boxed2sdf: filters have changed

	* lib/sdf-2.3: deleted
	* lib/sdf-2.1: new directory
	* lib/sdf-2.1/Makefile.am: new file
	* lib/Makefile.am: SUBDIRS correction
	* lib/sdf-cons/Makfile.am: do not need sdf-cons for build any more,
	just for inclusion

	* configure.ac: new and deleted directories

	* test/defs.in: tools using has changed

        Initial Checkin

        * Makefile.am, config/Makefile.am, configure.ac, src/Makefile.am:
        Remove disambiguation tools, they are moved to the cxx-grammar package.
        * bootstrap: Use autoreconf.
        * src/split/Makefile.am, src/undo/Makefile.am, src/unfor/Makefile.am:
        Update path to Makefile.xt, which is now in config.

        * config/check-rules.mk, src/declaration/*, src/declarator/*,
        * src/disambiguate/*, src/namespace/*, src/layout/*, src/resolve/*,
        * src/specifier/*, src/typedef/*, lib/*, test/*, src/xtc/*: Remove.

        * configure.ac, config/check-rules.mk: Use pre-parsed `Cxx.pp.af' and
        `Dxx.pp.af' instead of `Cxx.pp' and `Dxx.pp'.

        * config/check-rules.mk: Make sure the detcc files never produce any
        ambiguity. Use pretty-print instead of `indent'.

        * src/disambiguate/TemplateArguments.str: New file.
        * src/disambiguate/Makefile.am: Add TemplateArguments.str.
        * src/disambiguate/ClassOrNamespaceTraverse.str,
        * src/disambiguate/Keys.str, src/disambiguate/NestedNameSpecifier.str:
        Handle template kinds.

        * test/disambiguate/template-04.cc: Fix test.
        * test/disambiguate/template-10.test, test/disambiguate/template-10.cc,
        * test/disambiguate/template-09.test, test/disambiguate/template-09.cc:
        New tests.
        * test/disambiguate/Makefile.am: Add new tests.

        * configure.ac, Makefile.am, README, test/Makefile.am,
        * lib/Makefile.am, src/*/Makefile.am: Cleanup.

        * src/declaration/*.str, src/declarator/*.str,
        * src/disambiguate/*.str, src/namespace/*.str,
        * src/resolve/afcxx-resolve.str, src/typedef/*.str,
        * lib/cxx/*.str, lib/prelude/*.str:
        Use `AsFix2-Syntax' from asfix-tools instead of `AsFix-Syntax'.

        * test/disambiguate/Makefile.am: Remove .astcc2 when `make clean'.
        * src/undo/Makefile.am, src/unfor/Makefile.am, src/split/Makefile.am:
        Use Cxx signature from `cxx-grammar' installation instead of `lib/cxx'.

        * src/undo/cxx-undo.str: Use |[...]| instead of |[...]c++|.
        * src/unfor/cxx-unfor.str: Use concrete syntax.
        * src/unfor/cxx-unfor.meta: New file.

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

	* Makefile.am, src/Makefile.am: Add BOOTCLEAN_SUBDIRS.
	* src/typedef/Makefile.am, src/unfor/Makefile.am, src/undo/Makefile.am:
	Use STRINCLUDES, add BOOTCLEANFILES, remove wildcards.

	* src/undo/cxx-undo.str: Use concrete syntax in rule `Undo'.
	* src/undo/cxx-undo.meta: Enable `StrategoCxx' concrete syntax in
	`cxx-undo.str'.

	* src/xtc/parse-cxx-det.str:
	Rename as...
	* src/xtc/parse-dxx.str:
	...this.

	* config/check-rules.mk, configure.ac, src/xtc/Makefile.am,
	* src/xtc/parse-dxx.str:
	Rename cxx-det to dxx everywhere.

	* src/declaration/afcpp-declaration.str,
	* src/declarator/afcpp-declarator.str,
	* src/disambiguate/afcpp-disambiguate.str,
	* src/layout/afcpp-rm-layout.str, src/namespace/afcpp-namespace.str,
	* src/resolve/afcpp-resolve.str, src/specifier/afcpp-specifier.str,
	* src/split/cpp-split.str, src/typedef/afcpp-typedef.str,
	* src/undo/cpp-undo.str, src/unfor/cpp-unfor.str,
	* src/xtc/parse-cpp.str, src/xtc/parse-det-cpp.str:
	Rename as...

	* src/declaration/afcxx-declaration.str,
	* src/declarator/afcxx-declarator.str,
	* src/disambiguate/afcxx-disambiguate.str,
	* src/layout/afcxx-rm-layout.str, src/namespace/afcxx-namespace.str,
	* src/resolve/afcxx-resolve.str, src/specifier/afcxx-specifier.str,
	* src/split/cxx-split.str, src/typedef/afcxx-typedef.str,
	* src/undo/cxx-undo.str, src/unfor/cxx-unfor.str,
	* src/xtc/parse-cxx.str, src/xtc/parse-det-cxx.str:
	...these.

	* Makefile.am, config/check-rules.mk, configure.ac, lib/Makefile.am,
	* lib/cxx/Makefile.am, src/declaration/afcxx-declaration.str,
	* src/declaration/Makefile.am, src/declarator/afcxx-declarator.str,
	* src/declarator/Makefile.am, src/disambiguate/afcxx-disambiguate.str,
	* src/disambiguate/Makefile.am, src/namespace/afcxx-namespace.str,
	* src/namespace/Makefile.am, src/layout/afcxx-rm-layout.str,
	* src/layout/Makefile.am, src/resolve/afcxx-resolve.str,
	* src/resolve/Makefile.am, src/specifier/afcxx-specifier.str,
	* src/specifier/Makefile.am, src/split/cxx-split.str,
	* src/split/Makefile.am, src/typedef/afcxx-typedef.str,
	* src/typedef/Makefile.am, src/undo/cxx-undo.str, src/undo/Makefile.am,
	* src/unfor/cxx-unfor.str, src/unfor/Makefile.am, stdconfig,
	* src/xtc/Makefile.am, src/xtc/parse-det-cxx.str,
	* src/xtc/parse-cxx.str:
	Rename Cpp to Cxx everywhere.

	* Makefile.am: Remove main repository from XTC_IMPORT, it was not
	necessary.
	* stdconfig: Remove CFLAGS, not needed anymore.

--- Makefile.am Wed, 02 Apr 2003 19:38:10 +0200 david_v (meta-c++-basic/1_Makefile.a 1.4 640)
+++ Makefile.am Tue, 13 May 2003 02:38:03 +0200 vasseu_c (meta-c++-basic/1_Makefile.a 1.4 640)
@@ -1,4 +1,4 @@
 SUBDIRS = config lib src test
 EXTRA_DIST = stdconfig bootstrap Makefile.xt
 include Makefile.xt
-XTC_IMPORT=$(STRATEGOXT)/share/StrategoXT/XTC $(CPP_GRAMMAR_PATH)/share/cpp-grammar/XTC
+XTC_IMPORT=$(STRATEGOXT)/share/xt-strategoxt/XTC $(CPP_GRAMMAR_PATH)/share/cpp-grammar/XTC
Index: stdconfig
--- stdconfig Wed, 26 Mar 2003 17:38:38 +0100 vasseu_c (meta-c++-basic/f/45_stdconfig 1.1 755)
+++ stdconfig Wed, 07 May 2003 00:51:50 +0200 vasseu_c (meta-c++-basic/f/45_stdconfig 1.1 755)
@@ -1,10 +1,7 @@
 #!/bin/sh

-XT_PREFIX=$HOME/xt
+XT=/usr

 ./bootstrap
-./configure --prefix=$HOME \
-            --with-xt=$XT_PREFIX \
-            --with-stratego-xt=$XT_PREFIX \
-            --with-xtc=$XT_PREFIX \
-           --with-cpp-grammar=$HOME
+./configure --prefix=$HOME --with-xt=$XT --with-cpp-grammar=$HOME \
+CFLAGS="-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm"

        * src/xtc/parse-cpp.str: Added the "-fi" forgotten paramater for sglr
	        call.

        * src/xtc: New directory.
        * src/xtc/Makefile.am, src/xtc/parse-cpp.str,
        * src/xtc/parse-det-cpp.str: New files. XTC programs.
        * Makefile.am: Added the XTC import of cpp-grammar and StrategoXT
        * src/Makefile.am: Added the xtc subdir

	* src/disambiguate/TemplateTraverse.str: Fix a bug: ambiguities in
	template parameters must prevent `resolv' from choosing this branch for
	ambiguity resolution.

        * src/declaration/Main.r, src/namespace/Main.r, src/typedef/Main.r,
        * src/declarator/Main.r, src/resolve/Main.r, src/undo/Main.r,
        * src/disambiguate/Main.r, src/specifier/Main.r, src/unfor/Main.r,
        * src/layout/Main.r, src/split/Main.r: Rename as...

        * src/declaration/afcpp-declaration.str,
        * src/namespace/afcpp-namespace.str, src/typedef/afcpp-typedef.str,
        * src/declarator/afcpp-declarator.str, src/resolve/afcpp-resolve.str,
        * src/undo/cpp-undo.str, src/disambiguate/afcpp-disambiguate.str,
        * src/specifier/afcpp-specifier.str, src/unfor/cpp-unfor.str,
        * src/layout/afcpp-rm-layout.str, src/split/cpp-split.str: ...these,
        and rename `main' strategy.

        * lib/cpp/TemplateIdsOverlays.str (template-id-overlay): Fix the
        "x' variable not bound" compile error, the variable was not correctly
        spelled in the argument list.

        * src/declarator/ParameterDeclarator.str
        (parameter-declarator-0-overlay, parameter-declarator-1-overlay):
        Fix a bug: `rhs' and `attr' were missing in the argument list, and
        bogus variables were used in the code.

        * Makefile.am, src/layout/Makefile.am, test/Makefile.am,
        * src/namespace/Makefile.am, lib/Makefile.am, src/resolve/Makefile.am,
        * lib/asfix/Makefile.am, src/specifier/Makefile.am,
        * lib/cpp/Makefile.am, src/split/Makefile.am, lib/prelude/Makefile.am,
        * src/typedef/Makefile.am, src/Makefile.am, src/undo/Makefile.am,
        * src/declaration/Makefile.am, src/unfor/Makefile.am,
        * src/declarator/Makefile.am, test/disambiguate/Makefile.am,
        * src/disambiguate/Makefile.am, config/check-rules.mk: 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.

	* src/disambiguate/TemplateTraverse.r: Replacing the template
	content by the resolution result seems a good idea.

	* test/disambiguate/template-07.cc,
	* test/disambiguate/template-07.detcc,
	* test/disambiguate/template-07.test: New test case.

	* test/disambiguate/template-08.cc,
	* test/disambiguate/template-08.detcc,
	* test/disambiguate/template-08.test: New test case.

	* test/disambiguate/Makefile.am: Update.

	* test/disambiguate/template-05.test: Skip this test.  We do not
	have yet the machinery needed to handle this case.
	* test/disambiguate/template-06.test: Likewise.

	* test/disambiguate/template-05.cc: Update.
	* test/disambiguate/template-06.cc: Update.

	* test/disambiguate/template-01.test: Compare the disambiguated
	tree to the reference file.
	* test/disambiguate/template-02.test: Likewise.
	* test/disambiguate/template-03.test: Likewise.

	* test/disambiguate/template-01.detcc: New file.
	* test/disambiguate/template-02.detcc: New file.
	* test/disambiguate/template-03.detcc: New file.

	* src/disambiguate/TemplateTraverse.r: Process template parameters
	properly.

	* src/disambiguate/TemplateClassDefinition.r: Minor fix.
	* src/disambiguate/Definition.r: Minor fix.

	* src/disambiguate/TemplateClassDefinition.r: In the environment,
	mark the newly defined class template with `class-template-kind'
	rather than `class-kind'.
	* src/disambiguate/Kinds.r: Add a new kind for class templates.

	* src/disambiguate/TemplateDefinition.r: Use the newly introduced
	strategies to process template definitions in the right way.
	* src/disambiguate/Parameter.r: New file.  When a set of template
	parameters is found, store it and strip it from all useless
	informations.

	* lib/cpp/TemplateParametersOverlays.r: New file.  Add overlays
	for some forms of template parameters.

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

	* src/layout/Main.r: New file.
	* src/layout/Makefile.am: New file.
	* src/layout: New directory.  Add a filter that removes all layout
	information from its input term.

	* lib/prelude/Layouts.r: New file.  Add some rules and strategies
	to manage layout nodes.

	* test/disambiguate/class-01.test: Update.
	* test/disambiguate/class-02.test: Update.
	* test/disambiguate/class-03.test: Update.
	* test/disambiguate/class-04.test: Update.
	* test/disambiguate/class-05.test: Update.
	* test/disambiguate/class-06.test: Update.
	* test/disambiguate/enum-01.test: Update.
	* test/disambiguate/factorial-01.test: Update.
	* test/disambiguate/inherit-01.test: Update.
	* test/disambiguate/inherit-02.test: Update.
	* test/disambiguate/inherit-03.test: Update.
	* test/disambiguate/inherit-04.test: Update.
	* test/disambiguate/inherit-05.test: Update.
	* test/disambiguate/inherit-06.test: Update.
	* test/disambiguate/inherit-07.test: Update.
	* test/disambiguate/inherit-08.test: Update.
	* test/disambiguate/inherit-09.test: Update.
	* test/disambiguate/main-01.test: Update.
	* test/disambiguate/main-02.test: Update.
	* test/disambiguate/namespace-01.test: Update.
	* test/disambiguate/namespace-02.test: Update.
	* test/disambiguate/namespace-03.test: Update.
	* test/disambiguate/namespace-04.test: Update.
	* test/disambiguate/namespace-05.test: Update.
	* test/disambiguate/parameter-01.test: Update.
	* test/disambiguate/parameter-02.test: Update.
	* test/disambiguate/parameter-03.test: Update.
	* test/disambiguate/parameter-04.test: Update.
	* test/disambiguate/parameter-05.test: Update.
	* test/disambiguate/parameter-06.test: Update.
	* test/disambiguate/parameter-07.test: Update.
	* test/disambiguate/parameter-08.test: Update.
	* test/disambiguate/power-01.test: Update.
	* test/disambiguate/power-02.test: Update.
	* test/disambiguate/struct-01.test: Update.
	* test/disambiguate/test-01.test: Update.
	* test/disambiguate/test-02.test: Update.
	* test/disambiguate/test-03.test: Update.
	* test/disambiguate/test-04.test: Update.
	* test/disambiguate/type-01.test: Update.
	* test/disambiguate/union-01.test: Update.

	* test/disambiguate/test-01.test: Compare the disambiguated tree
	to the reference file.
	* test/disambiguate/test-02.test: Likewise.
	* test/disambiguate/test-03.test: Likewise.
	* test/disambiguate/test-04.test: Likewise.

	* test/disambiguate/test-01.detcc: New file.
	* test/disambiguate/test-02.detcc: New file.
	* test/disambiguate/test-03.detcc: New file.
	* test/disambiguate/test-04.detcc: New file.

	* test/disambiguate/struct-01.test: Compare the disambiguated tree
	to the reference file.
	* test/disambiguate/type-01.test: Likewise.
	* test/disambiguate/union-01.test: Likewise.

	* test/disambiguate/struct-01.detcc: New file.
	* test/disambiguate/type-01.detcc: New file.
	* test/disambiguate/union-01.detcc: New file.

	* test/disambiguate/power-01.test: Compare the disambiguated
	tree to the reference file.
	* test/disambiguate/power-02.test: Likewise.

	* test/disambiguate/power-01.detcc: New file.
	* test/disambiguate/power-02.detcc: New file.