Changeset 253 for trunk

Timestamp:

03/05/10 16:09:45 (14 years ago)

Author:

bernard

Message:

No more global data are used for both the loop checking and the order generating (all data are passed as parameters to the functions). Update of the Modul.hpp and Modul.cpp files to integrate the informations required by the loop checking. No more instanciation of an Order object inside the automaticOrderGenerator() function but use of the this pointer (as the function can not be declared as static, this internal instanciation was not needed anymore

Location:

trunk/yao

Files:

• bin/Yao9Generator (modified) (previous)
• share/antlr-2.7.7/antlr/Makefile (modified) (13 diffs)
• share/antlr-2.7.7/antlr/Makefile.in (modified) (1 diff)
• share/antlr-2.7.7/antlr/Version.java (modified) (1 diff)
• share/antlr-2.7.7/config.log (modified) (2 diffs)
• share/antlr-2.7.7/config.status (modified) (1 diff)
• share/antlr-2.7.7/lib/csharp/Makefile (modified) (11 diffs)
• share/antlr-2.7.7/lib/csharp/antlr.astframe/Makefile (modified) (12 diffs)
• src/Translator.cpp (modified) (2 diffs)
• src/YAOObjects/Modul.cpp (modified) (1 diff)
• src/YAOObjects/Modul.hpp (modified) (1 diff)
• src/YAOObjects/Order.cpp (modified) (67 diffs)
• src/YAOObjects/Order.hpp (modified) (18 diffs)

trunk/yao/share/antlr-2.7.7/antlr/Makefile

@@ -1 @@
-##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+## do not change this value
+subdir=.
+
+## get  standard variables from autoconf - autoconf will replace
+## this variable with content of "scripts/config.vars".
 
 ## --*- Makefile -*--
@@ -5 +9 @@
 
 ## helper utilities ..
-INSTALL         = /usr/bin/install -c
-MKDIR           = /bin/mkdir
-RM              = /bin/rm -r -f
-RMF             = /bin/rm -r -f
-TAR             = /bin/tar
+INSTALL         = /usr/bin/ginstall -c
+MKDIR           = /usr/bin/mkdir
+RM              = /usr/bin/rm -r -f
+RMF             = /usr/bin/rm -r -f
+TAR             = /usr/bin/tar
 TOUCH           = /bin/touch
-CHMOD           = /bin/chmod
-SED             = /bin/sed
-GREP            = /bin/grep
-CAT             = /bin/cat
-CHMOD           = /bin/chmod
+CHMOD           = /usr/bin/chmod
+SED             = /usr/bin/sed
+GREP            = /usr/bin/grep
+CAT             = /usr/bin/cat
+CHMOD           = /usr/bin/chmod
 CP              = /bin/cp
 ECHO            = /bin/echo
@@ -57 +61 @@
 
 # navigation 
-builddir        = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-buildtree       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-sourcetree      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+builddir        = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
+buildtree       = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
+sourcetree      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 
 ## Two abbrevs to shorten things. $(thisdir) shall be the current
@@ -65 +69 @@
 ## source dir companion. That means that  $(thisdir)/Makefile has
 ## been generated by $(_srcdir)/Makefile.in.
-_srcdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
-thisdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$(subdir)
+_srcdir         = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
+thisdir         = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$(subdir)
 
 # variable 'srcdir' is deprecated - use sourcetree
-srcdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+srcdir          = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 # variable 'objdir' is deprecated - use buildtree
-objdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
+objdir          = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
 
 # other
@@ -79 +83 @@
 SUBDIRS_NOT    := .
 
-CLR            = /usr/bin/mono
-
-ANTLR_JAR      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
-ANTLR_LIB      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
-ANTLR_NET      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
-ANTLR_PY       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
-ASTFRAME_NET   = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
+CLR            = 
+
+ANTLR_JAR      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
+ANTLR_LIB      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
+ANTLR_NET      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
+ANTLR_PY       = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
+ASTFRAME_NET   = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
 
 antlr_jar      = antlr.jar
@@ -92 +96 @@
 antlr_py       = python.py
 astframe_net   = antlr.astframe.dll
+
+## By default, make will jump into any sub directory  containing
+## a file named "Makefile". This is done in the order implied by
+## /bin/ls. You can override this by using variable SUBDIRS. For
+## example, if not set, then make behaves as if
+##   SUBDIRS     = antlr doc examples lib
+## has been set.
+
+SUBDIRS = antlr lib doc 
+
+## When using stdmake  before  any other rule, then the default
+## rule is "all"  and  behaviour  of  make is first to make all
+## subdirectories  and then all "local"  targets with name all,
+## clean, install, test etc.
+## Sometimes it's usefull to make the local target first and then
+## subdirs. To  enforce  this, just listen target in question be-
+## fore "stdmake". By doing so, your target will become the
+## default. This is usually not what you want. Therefore introduce
+## a pseude rule (like this) to tell make about the default target.
+this : all
+
+
+## get standard make rules from autoconf
+
+##xxxxxxxxxxxxxxxxxxxxxx --*- Makefile -*-- xxxxxxxxxxxxxxxx>>> config.make
+## By default, make will jump into any sub directory that contains a   file 
+## named "Makefile". This is done  in the order implied by "/bin/ls"  which
+## is in almost  all  cases  correct  (note  that  you  should  not  design 
+## Makefiles which depend on a specific invocation order). You can override
+## specific  behaviour  by  using  variable SUBDIRS. If given and not empty,
+## "/bin/ls" is not used. Also,  if you want to disable jumping subdirs you
+## may  use  either ".", ".."  as  value for SUBDIRS. Note that SUBDIRS may 
+## contain any directory (except "." and "..).
+
+## This is very much  GNU specific, sigh.  Variable SUBDIRS is used to tell 
+## make which  subdirectory to jump. It's  value is normally preset or just
+## empty, in which case /bin/ls is used as discussed above. However, I also
+## want that a user can say
+##
+##  make SUBDIRS="d1 d2 .. dn"
+##
+## That means, ignore defaults and go ahead and make exactly this director-
+## ies mentioned. Of course, this should only have  an  impact  on Makefile
+## being used  by  "make"  but not for any makefils in d1 .. dn, right? For
+## example, if di  needs  to  make directories a,b and c, then they need to
+## be made of course. So all burns down to the question how to prevent a
+## variable from being passed to submakes. Below you can see the answer. If
+## you believe that there's a simpler answer to the problem don't hesistate
+## to try it out. If  it  works, send me an email: ora dot et dot labora at
+## web dot de. But be warned - you need to try all variations.
+##
+## Here is in short what  I  found  and how  it  works.  Variables given on 
+## command line  are  saved  in  variable  MAKEOVERRIDES. This  variable is 
+## exported  and  passed down. On  invocation  of a submake file, make will
+## have a  look  into MAKEOVERRIDES  and unpack each variable found therein.
+## Therefore I'm just going to  remove  every (?) occurance of SUBDIRS from
+## this variable. 
+MAKEOVERRIDES := $(patsubst SUBDIRS=%,,$(MAKEOVERRIDES))
+
+
+## The actuall rule on how to make a recursive target.
+all clean distclean test install force-target clean-target :: 
+        @dirs="$(SUBDIRS)" ; \
+        test -z "$${dirs}" && { \
+                dirs=`/bin/ls` ; \
+  } ; \
+        for d in . $${dirs} ; do \
+                case $${d} in \
+                . | .. ) ;; \
+          $(SUBDIRS_NOT) ) ;; \
+                *) \
+                if test -f "$${d}/Makefile" ; then \
+                  echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+                  echo ">> /usr/bin/make -C $(subdir)/$${d} $@                          " ; \
+                        echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+                        /usr/bin/make -C "$$d" $@ || exit 1 ;\
+                fi ; \
+                ;; \
+                esac ; \
+        done
+
+## For historical  reasons only you can make local targets as "this-*" or 
+## "*-this" rules. The  default is to do nothing. Although this targets
+## exists, it is recommended to define further "all", "clean" etc. double
+## colon rules.
+ 
+all       :: this-all all-this
+clean     :: this-clean clean-this
+distclean :: this-distclean distclean-this
+test      :: this-test test-this
+install   :: this-install install-this
+
+this-all ::
+this-clean ::
+this-distclean ::
+this-test ::
+this-install ::
+
+all-this ::
+clean-this ::
+distclean-this ::
+test-this ::
+install-this ::
+
+force-target :: clean-target all
+
+distclean :: clean
+
+distclean ::
+        $(RM) Makefile
+
+## xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<< config.make 
+
+test clean distclean install ::
+        @ if test -f examples/Makefile ; then \
+                /usr/bin/make -C examples $@ ; \
+        fi
+
+# Rule  to  remove  all objects, cores, ANTLR generated,
+# configure generated, etc. This is not a recursive rule
+# because distclean removes files unconditionally
+# included by subdirectory Makefiles.
+#
+maintainer-clean: distclean
+        -/usr/bin/rm -r -f -f configure
+
+#
+# Rule to make a tarball exclusive all kinds of fluff
+#
+
+TIMESTAMP       = $(shell date +%Y%m%d)
+TAR_DIR         = $(versioneddir)
+TAR_FILE              = $(versioneddir).tar
+
+_tar:
+        -/usr/bin/rm -r -f $(TAR_DIR)
+        ln -s $(srcdir) $(TAR_DIR)
+        $(TAR) cfh $(TAR_FILE) \
+                                --exclude CVS \
+                                --exclude *.pyc \
+                                --exclude *.o \
+                                --exclude *.d \
+                                --exclude *.lo \
+                                --exclude *.a \
+                                --exclude *.la \
+                                --exclude *.lai \
+                                --exclude *.so \
+                                --exclude *.class \
+                                --exclude .deps \
+                                --exclude .depend \
+                                --exclude config.cache \
+                                --exclude config.status \
+                                --exclude Config.make \
+                                --exclude antlr-config \
+                                --exclude run-antlr \
+                                --exclude *~ \
+                                --exclude core \
+                                --exclude dmalloc.log \
+                                --exclude .gdb_history \
+                                --exclude ".nfs*" \
+                                --exclude "$(TAR_DIR)/gen_doc/html" \
+                                --exclude "$(TAR_DIR)/gen_doc/html/*" \
+                                --exclude Makefile \
+                                $(TAR_DIR)
+        /usr/bin/chmod 660 $(TAR_FILE)
+        /usr/bin/rm -r -f $(TAR_DIR)
+
+tar backup : _tar
+        gzip -f --best $(TAR_FILE)
+
+## When building a release, it's crucial that time stamps are up-to-date and that
+## files have proper permission bit set. Since $(srcdir) might be under the 
+## control of Perforce (or an other versioning system), I'm going to unpack the
+## tar file again in a local directory and update time stamps as well as 
+## permission.
+release : /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar _tar
+        /usr/bin/tar xpf $(TAR_FILE)
+        /bin/cp /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar $(TAR_DIR)
+        find $(TAR_DIR) -type f | xargs /usr/bin/chmod 644
+        find $(TAR_DIR) -type d | xargs /usr/bin/chmod 755
+        /usr/bin/chmod 777 $(TAR_DIR)/configure
+        find $(TAR_DIR) | xargs /bin/touch
+        find $(TAR_DIR)/antlr -name \*.java | xargs /bin/touch
+        /usr/bin/tar cf $(TAR_FILE) $(TAR_DIR)
+        gzip -f --best $(TAR_FILE)
+        gzip -t -v $(TAR_FILE).gz
+        /usr/bin/rm -r -f $(TAR_DIR)
+
+## This one for RK:
+new_version antlr/Version.java:
+        @/bin/echo "Rebuilding Version.java"
+        @/bin/echo "package antlr;"  > antlr/Version.java
+        @/bin/echo "public class Version {"  >> antlr/Version.java
+        @/bin/echo " public static final String version    = \"$(VERSION)\";"  >> antlr/Version.java
+        @/bin/echo " public static final String subversion = \"$(SUBVERSION)\";"  >> antlr/Version.java
+        @/bin/echo " public static final String patchlevel = \"$(PATCHLEVEL)\";"  >> antlr/Version.java
+        @/bin/echo " public static final String datestamp  = \"$(TIMESTAMP)\";"  >> antlr/Version.java
+        @/bin/echo " public static final String project_version = \"$(VERSION).$(SUBVERSION).$(PATCHLEVEL) ($(TIMESTAMP))\";"  >> antlr/Version.java
+        @/bin/echo "}"  >> antlr/Version.java
+
+## Installation is delegated to sub directories - as configured.
+## Here we  just  create  a  bin  directory that should contain
+## scripts to mess up with ANTLR. Other things to do?
+
+docdir   = $(datadir)/doc/$(versioneddir)
+extradir = $(datadir)/$(versioneddir)
+
+install ::
+        $(MKDIR) -p "$(bindir)"
+        $(MKDIR) -p "$(extradir)"
+        $(MKDIR) -p "$(docdir)"
+        $(INSTALL) -m 755 scripts/run-antlr                          "$(bindir)/antlr"
+        $(INSTALL) -m 755 scripts/antlr-config                       "$(bindir)/antlr-config"
+        $(INSTALL) -m 444 /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/extras/antlr-mode.el      "$(extradir)"
+        $(INSTALL) -m 444 /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/extras/antlr-jedit.xml    "$(extradir)"
+        $(INSTALL) -m 444 /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/LICENSE.txt               "$(docdir)"
+        $(INSTALL) -m 444 /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/README.txt                "$(docdir)"
+        $(INSTALL) -m 444 /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/INSTALL.txt               "$(docdir)"
+
+install ::
+        /bin/echo "installation done"
+
+# Make sure that all generated files are removed
+distclean_obj = \
+ config.* \
+ Makefile \
+ scripts/antlr-config \
+ scripts/antlr.sh \
+ scripts/antlr.spec \
+ scripts/config.deps \
+ scripts/config.make \
+ scripts/config.vars \
+ scripts/cpp.sh \
+ scripts/csc.sh \
+ scripts/c.sh \
+ scripts/cxx.sh \
+ scripts/jar.sh \
+ scripts/javac.sh \
+ scripts/java.sh \
+ scripts/lib.sh \
+ scripts/link.sh \
+ scripts/pyantlr.sh \
+ scripts/python.sh \
+ scripts/run-antlr \
+ $(eof)
+
+distclean :: clean
+        /usr/bin/rm -r -f $(distclean_obj)
+        Q=`find . -name Makefile` && test -n "$$Q" && /usr/bin/rm -r -f $${Q}
+
+### phony targets - make this targets even if file with same name exists.
+.PHONY: bootstrap backup maintainer-clean
 ##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-## do not change this value 
-subdir=antlr
-
-## compile java files
-all: /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
-
-## 
-antlr_java_action_FILES = \
-  actions/java/ActionLexer.java \
-  actions/java/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_cpp_action_FILES = \
-  actions/cpp/ActionLexer.java \
-  actions/cpp/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_csharp_action_FILES = \
-  actions/csharp/ActionLexer.java \
-  actions/csharp/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_python_action_FILES = \
-  actions/python/ActionLexer.java \
-  actions/python/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_python_code_FILES = \
-  actions/python/CodeLexer.java \
-  actions/python/CodeLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_antlr_FILES = \
-  ANTLRParser.java \
-  ANTLRTokenTypes.java \
-  ANTLRLexer.java  \
-  $(eol)
-
-##
-antlr_tokdef_FILES = \
-  ANTLRTokdefParser.java \
-  ANTLRTokdefLexer.java \
-  ANTLRTokdefParserTokenTypes.java \
-        $(eol)
-
-## all actions files 
-antlr_action_FILES = \
- $(antlr_java_action_FILES) \
- $(antlr_cpp_action_FILES) \
- $(antlr_csharp_action_FILES) \
- $(antlr_python_action_FILES) \
- $(antlr_python_code_FILES) \
- $(eol)
-
-## all generated files 
-antlr_gen_FILES = \
-  $(antlr_antlr_FILES) \
-  $(antlr_tokdef_FILES) \
-  $(antlr_action_FILES) \
-  $(eol)
-
-## all java files 
-antlr_java1_FILES = \
-  Version.java \
-  $(antlr_gen_FILES) \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ANTLRError.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ANTLRException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ANTLRGrammarParseBehavior.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ANTLRHashString.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ANTLRStringBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASTFactory.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASTIterator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASTNULLType.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASTPair.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASTVisitor.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASdebug/ASDebugStream.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASdebug/IASDebugStream.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ASdebug/TokenOffsetInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ActionElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ActionTransInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Alternative.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/AlternativeBlock.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/AlternativeElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/BaseAST.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/BlockContext.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/BlockEndElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/BlockWithImpliedExitPath.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ByteBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CSharpBlockFinishingInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CSharpCharFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CSharpCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CSharpNameSpace.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharLiteralElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharQueue.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharRangeElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharScanner.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharStreamException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CharStreamIOException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CommonAST.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CommonASTWithHiddenTokens.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CommonHiddenStreamToken.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CommonToken.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CppBlockFinishingInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CppCharFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/CppCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DefaultFileLineFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DefaultJavaCodeGeneratorPrintWriterManager.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DefaultToolErrorHandler.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DefineGrammarSymbols.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DiagnosticCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DocBookCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/DumpASTVisitor.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ExceptionHandler.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ExceptionSpec.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/FileCopyException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/FileLineFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Grammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/GrammarAnalyzer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/GrammarAtom.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/GrammarElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/GrammarSymbol.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/HTMLCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ImportVocabTokenManager.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/InputBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/JavaBlockFinishingInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/JavaCharFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/JavaCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/JavaCodeGeneratorPrintWriterManager.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/LLkAnalyzer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/LLkGrammarAnalyzer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/LLkParser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/LexerGrammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/LexerSharedInputState.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Lookahead.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/MakeGrammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/MismatchedCharException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/MismatchedTokenException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/NameSpace.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/NoViableAltException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/NoViableAltForCharException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/OneOrMoreBlock.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ParseTree.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ParseTreeRule.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ParseTreeToken.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Parser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ParserGrammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ParserSharedInputState.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/PreservingFileWriter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/PrintWriterWithSMAP.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/PythonBlockFinishingInfo.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/PythonCharFormatter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/PythonCodeGenerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/RecognitionException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/RuleBlock.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/RuleEndElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/RuleRefElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/RuleSymbol.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/SemanticException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/SimpleTokenManager.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/StringLiteralElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/StringLiteralSymbol.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/StringUtils.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/SynPredBlock.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Token.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenManager.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenQueue.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenRangeElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenRefElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStream.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamBasicFilter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamHiddenTokenFilter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamIOException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamRecognitionException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamRetryException.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamRewriteEngine.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenStreamSelector.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenSymbol.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TokenWithIndex.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Tool.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ToolErrorHandler.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeBlockContext.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeParser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeParserSharedInputState.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeSpecifierNode.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/TreeWalkerGrammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/Utils.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/WildcardElement.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/ZeroOrMoreBlock.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/build/ANTLR.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/build/StreamScarfer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/build/Tool.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/AST.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/ASTEnumeration.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/Enumerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/List.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/Stack.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/ASTArray.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/ASTEnumerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/BitSet.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/IndexedVector.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/IntRange.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/LLCell.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/LLEnumeration.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/LList.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/Vector.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/VectorEnumeration.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/collections/impl/VectorEnumerator.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/DebuggingCharScanner.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/DebuggingInputBuffer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/DebuggingParser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/Event.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/GuessingEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/InputBufferAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/InputBufferEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/InputBufferEventSupport.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/InputBufferListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/InputBufferReporter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/LLkDebuggingParser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ListenerBase.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/MessageAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/MessageEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/MessageListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/NewLineEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/NewLineListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParseTreeDebugParser.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserController.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserEventSupport.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserMatchAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserMatchEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserMatchListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserReporter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserTokenAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserTokenEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/ParserTokenListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SemanticPredicateAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SemanticPredicateEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SemanticPredicateListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SyntacticPredicateAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SyntacticPredicateEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/SyntacticPredicateListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/TraceAdapter.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/TraceEvent.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/TraceListener.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/Tracer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/misc/ASTFrame.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Grammar.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/GrammarFile.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Hierarchy.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Option.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Preprocessor.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/PreprocessorLexer.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/PreprocessorTokenTypes.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Rule.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/preprocessor/Tool.java \
-        $(eol)
-
-antlr_swing_FILES = \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/misc/JTreeASTModel.java \
-  /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/debug/misc/JTreeASTPanel.java \
-  $(eol)
-
-
-## damned ugly hack ..
-#ifeq (gcj,javac)
-#       antlr_java_FILES = $(antlr_java1_FILES)
-#else
-        antlr_java_FILES = $(antlr_java1_FILES) $(antlr_swing_FILES)
-#endif
-
-## rule how to compile java files 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar :: $(antlr_java_FILES)
-        @ -/bin/rm -r -f $@
-        @ /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/javac.sh $?
-        @ /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/jar.sh $@ antlr
-        @ test -f $@ || { exit 1; }
-
-## how ANTLR grammar files ..
-$(antlr_java_action_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/actions/java/action.g
-        @cd actions/java && /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_cpp_action_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/actions/cpp/action.g
-        @cd actions/cpp && /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_csharp_action_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/actions/csharp/action.g
-        @cd actions/csharp && /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_python_action_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/actions/python/action.g
-        @cd actions/python && /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_python_code_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/actions/python/code.g
-        @cd actions/python && /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_antlr_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/antlr.g
-        /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-$(antlr_tokdef_FILES) : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/../antlr/tokdef.g
-        /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh $<
-
-clean ::
-        /bin/rm -r -f *.class antlr /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
-
-distclean :: clean
-        /bin/rm -r -f $(antlr_gen_FILES)
-
-## install antlr.jar in libdirectory if exists
-install ::      /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar 
-        -$(MKDIR) -p "$(libdir)"
-        -$(MKDIR) -p "$(datadir)/$(versioneddir)"
-        -test -f /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar && {\
-         $(INSTALL) -m 444 /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar "$(datadir)/$(versioneddir)" ; \
-         $(INSTALL) -m 444 /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar "$(libdir)" ; \
-        }
-
-distclean :: clean
-        /bin/rm -r -f Makefile Version.java
-
-## get configured dependencies
 
 ## --*- Makefile -*--
@@ -438 +363 @@
 .SUFFIXES:
 
-Makefile :: /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status
+Makefile :: /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
+            /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
+                                          /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make \
+                                          /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
+            /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/config.status
         @echo "*** update $(subdir)/Makefile"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../configure
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/config.status : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../configure
         @echo "*** reconfigure $@ - stay tuned .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
         @echo "*** update all configured files .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
 
 ### In a pure devel mode there should be also a dependency listed on how
@@ -476 +401 @@
 ###
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
 
 
@@ -540 +465 @@
 ## variable $(subdir) proper.
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
         @ subdir="lib/csharp/antlr.runtime" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -551 +476 @@
     esac
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
         @ subdir="lib/csharp/antlr.astframe" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -563 +488 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
         @ subdir="antlr" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -575 +500 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
         @ subdir="lib/cpp/src" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -586 +511 @@
     esac
 
-
-
+##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/yao/share/antlr-2.7.7/antlr/Makefile.in

@@ -1 @@
-##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+## do not change this value
+subdir=.
+
+## get  standard variables from autoconf - autoconf will replace
+## this variable with content of "scripts/config.vars".
 @stdvars@
-##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-## do not change this value 
-subdir=antlr
+## By default, make will jump into any sub directory  containing
+## a file named "Makefile". This is done in the order implied by
+## /bin/ls. You can override this by using variable SUBDIRS. For
+## example, if not set, then make behaves as if
+##   SUBDIRS     = antlr doc examples lib
+## has been set.
 
-## compile java files
-all: @ANTLR_JAR@
+SUBDIRS = antlr lib doc 
 
-## 
-antlr_java_action_FILES = \
-  actions/java/ActionLexer.java \
-  actions/java/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_cpp_action_FILES = \
-  actions/cpp/ActionLexer.java \
-  actions/cpp/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_csharp_action_FILES = \
-  actions/csharp/ActionLexer.java \
-  actions/csharp/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_python_action_FILES = \
-  actions/python/ActionLexer.java \
-  actions/python/ActionLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_python_code_FILES = \
-  actions/python/CodeLexer.java \
-  actions/python/CodeLexerTokenTypes.java \
-  $(eol)
-
-##
-antlr_antlr_FILES = \
-  ANTLRParser.java \
-  ANTLRTokenTypes.java \
-  ANTLRLexer.java  \
-  $(eol)
-
-##
-antlr_tokdef_FILES = \
-  ANTLRTokdefParser.java \
-  ANTLRTokdefLexer.java \
-  ANTLRTokdefParserTokenTypes.java \
-        $(eol)
-
-## all actions files 
-antlr_action_FILES = \
- $(antlr_java_action_FILES) \
- $(antlr_cpp_action_FILES) \
- $(antlr_csharp_action_FILES) \
- $(antlr_python_action_FILES) \
- $(antlr_python_code_FILES) \
- $(eol)
-
-## all generated files 
-antlr_gen_FILES = \
-  $(antlr_antlr_FILES) \
-  $(antlr_tokdef_FILES) \
-  $(antlr_action_FILES) \
-  $(eol)
-
-## all java files 
-antlr_java1_FILES = \
-  Version.java \
-  $(antlr_gen_FILES) \
-  @abs_top_srcdir@/antlr/ANTLRError.java \
-  @abs_top_srcdir@/antlr/ANTLRException.java \
-  @abs_top_srcdir@/antlr/ANTLRGrammarParseBehavior.java \
-  @abs_top_srcdir@/antlr/ANTLRHashString.java \
-  @abs_top_srcdir@/antlr/ANTLRStringBuffer.java \
-  @abs_top_srcdir@/antlr/ASTFactory.java \
-  @abs_top_srcdir@/antlr/ASTIterator.java \
-  @abs_top_srcdir@/antlr/ASTNULLType.java \
-  @abs_top_srcdir@/antlr/ASTPair.java \
-  @abs_top_srcdir@/antlr/ASTVisitor.java \
-  @abs_top_srcdir@/antlr/ASdebug/ASDebugStream.java \
-  @abs_top_srcdir@/antlr/ASdebug/IASDebugStream.java \
-  @abs_top_srcdir@/antlr/ASdebug/TokenOffsetInfo.java \
-  @abs_top_srcdir@/antlr/ActionElement.java \
-  @abs_top_srcdir@/antlr/ActionTransInfo.java \
-  @abs_top_srcdir@/antlr/Alternative.java \
-  @abs_top_srcdir@/antlr/AlternativeBlock.java \
-  @abs_top_srcdir@/antlr/AlternativeElement.java \
-  @abs_top_srcdir@/antlr/BaseAST.java \
-  @abs_top_srcdir@/antlr/BlockContext.java \
-  @abs_top_srcdir@/antlr/BlockEndElement.java \
-  @abs_top_srcdir@/antlr/BlockWithImpliedExitPath.java \
-  @abs_top_srcdir@/antlr/ByteBuffer.java \
-  @abs_top_srcdir@/antlr/CSharpBlockFinishingInfo.java \
-  @abs_top_srcdir@/antlr/CSharpCharFormatter.java \
-  @abs_top_srcdir@/antlr/CSharpCodeGenerator.java \
-  @abs_top_srcdir@/antlr/CSharpNameSpace.java \
-  @abs_top_srcdir@/antlr/CharBuffer.java \
-  @abs_top_srcdir@/antlr/CharFormatter.java \
-  @abs_top_srcdir@/antlr/CharLiteralElement.java \
-  @abs_top_srcdir@/antlr/CharQueue.java \
-  @abs_top_srcdir@/antlr/CharRangeElement.java \
-  @abs_top_srcdir@/antlr/CharScanner.java \
-  @abs_top_srcdir@/antlr/CharStreamException.java \
-  @abs_top_srcdir@/antlr/CharStreamIOException.java \
-  @abs_top_srcdir@/antlr/CodeGenerator.java \
-  @abs_top_srcdir@/antlr/CommonAST.java \
-  @abs_top_srcdir@/antlr/CommonASTWithHiddenTokens.java \
-  @abs_top_srcdir@/antlr/CommonHiddenStreamToken.java \
-  @abs_top_srcdir@/antlr/CommonToken.java \
-  @abs_top_srcdir@/antlr/CppBlockFinishingInfo.java \
-  @abs_top_srcdir@/antlr/CppCharFormatter.java \
-  @abs_top_srcdir@/antlr/CppCodeGenerator.java \
-  @abs_top_srcdir@/antlr/DefaultFileLineFormatter.java \
-  @abs_top_srcdir@/antlr/DefaultJavaCodeGeneratorPrintWriterManager.java \
-  @abs_top_srcdir@/antlr/DefaultToolErrorHandler.java \
-  @abs_top_srcdir@/antlr/DefineGrammarSymbols.java \
-  @abs_top_srcdir@/antlr/DiagnosticCodeGenerator.java \
-  @abs_top_srcdir@/antlr/DocBookCodeGenerator.java \
-  @abs_top_srcdir@/antlr/DumpASTVisitor.java \
-  @abs_top_srcdir@/antlr/ExceptionHandler.java \
-  @abs_top_srcdir@/antlr/ExceptionSpec.java \
-  @abs_top_srcdir@/antlr/FileCopyException.java \
-  @abs_top_srcdir@/antlr/FileLineFormatter.java \
-  @abs_top_srcdir@/antlr/Grammar.java \
-  @abs_top_srcdir@/antlr/GrammarAnalyzer.java \
-  @abs_top_srcdir@/antlr/GrammarAtom.java \
-  @abs_top_srcdir@/antlr/GrammarElement.java \
-  @abs_top_srcdir@/antlr/GrammarSymbol.java \
-  @abs_top_srcdir@/antlr/HTMLCodeGenerator.java \
-  @abs_top_srcdir@/antlr/ImportVocabTokenManager.java \
-  @abs_top_srcdir@/antlr/InputBuffer.java \
-  @abs_top_srcdir@/antlr/JavaBlockFinishingInfo.java \
-  @abs_top_srcdir@/antlr/JavaCharFormatter.java \
-  @abs_top_srcdir@/antlr/JavaCodeGenerator.java \
-  @abs_top_srcdir@/antlr/JavaCodeGeneratorPrintWriterManager.java \
-  @abs_top_srcdir@/antlr/LLkAnalyzer.java \
-  @abs_top_srcdir@/antlr/LLkGrammarAnalyzer.java \
-  @abs_top_srcdir@/antlr/LLkParser.java \
-  @abs_top_srcdir@/antlr/LexerGrammar.java \
-  @abs_top_srcdir@/antlr/LexerSharedInputState.java \
-  @abs_top_srcdir@/antlr/Lookahead.java \
-  @abs_top_srcdir@/antlr/MakeGrammar.java \
-  @abs_top_srcdir@/antlr/MismatchedCharException.java \
-  @abs_top_srcdir@/antlr/MismatchedTokenException.java \
-  @abs_top_srcdir@/antlr/NameSpace.java \
-  @abs_top_srcdir@/antlr/NoViableAltException.java \
-  @abs_top_srcdir@/antlr/NoViableAltForCharException.java \
-  @abs_top_srcdir@/antlr/OneOrMoreBlock.java \
-  @abs_top_srcdir@/antlr/ParseTree.java \
-  @abs_top_srcdir@/antlr/ParseTreeRule.java \
-  @abs_top_srcdir@/antlr/ParseTreeToken.java \
-  @abs_top_srcdir@/antlr/Parser.java \
-  @abs_top_srcdir@/antlr/ParserGrammar.java \
-  @abs_top_srcdir@/antlr/ParserSharedInputState.java \
-  @abs_top_srcdir@/antlr/PreservingFileWriter.java \
-  @abs_top_srcdir@/antlr/PrintWriterWithSMAP.java \
-  @abs_top_srcdir@/antlr/PythonBlockFinishingInfo.java \
-  @abs_top_srcdir@/antlr/PythonCharFormatter.java \
-  @abs_top_srcdir@/antlr/PythonCodeGenerator.java \
-  @abs_top_srcdir@/antlr/RecognitionException.java \
-  @abs_top_srcdir@/antlr/RuleBlock.java \
-  @abs_top_srcdir@/antlr/RuleEndElement.java \
-  @abs_top_srcdir@/antlr/RuleRefElement.java \
-  @abs_top_srcdir@/antlr/RuleSymbol.java \
-  @abs_top_srcdir@/antlr/SemanticException.java \
-  @abs_top_srcdir@/antlr/SimpleTokenManager.java \
-  @abs_top_srcdir@/antlr/StringLiteralElement.java \
-  @abs_top_srcdir@/antlr/StringLiteralSymbol.java \
-  @abs_top_srcdir@/antlr/StringUtils.java \
-  @abs_top_srcdir@/antlr/SynPredBlock.java \
-  @abs_top_srcdir@/antlr/Token.java \
-  @abs_top_srcdir@/antlr/TokenBuffer.java \
-  @abs_top_srcdir@/antlr/TokenManager.java \
-  @abs_top_srcdir@/antlr/TokenQueue.java \
-  @abs_top_srcdir@/antlr/TokenRangeElement.java \
-  @abs_top_srcdir@/antlr/TokenRefElement.java \
-  @abs_top_srcdir@/antlr/TokenStream.java \
-  @abs_top_srcdir@/antlr/TokenStreamBasicFilter.java \
-  @abs_top_srcdir@/antlr/TokenStreamException.java \
-  @abs_top_srcdir@/antlr/TokenStreamHiddenTokenFilter.java \
-  @abs_top_srcdir@/antlr/TokenStreamIOException.java \
-  @abs_top_srcdir@/antlr/TokenStreamRecognitionException.java \
-  @abs_top_srcdir@/antlr/TokenStreamRetryException.java \
-  @abs_top_srcdir@/antlr/TokenStreamRewriteEngine.java \
-  @abs_top_srcdir@/antlr/TokenStreamSelector.java \
-  @abs_top_srcdir@/antlr/TokenSymbol.java \
-  @abs_top_srcdir@/antlr/TokenWithIndex.java \
-  @abs_top_srcdir@/antlr/Tool.java \
-  @abs_top_srcdir@/antlr/ToolErrorHandler.java \
-  @abs_top_srcdir@/antlr/TreeBlockContext.java \
-  @abs_top_srcdir@/antlr/TreeElement.java \
-  @abs_top_srcdir@/antlr/TreeParser.java \
-  @abs_top_srcdir@/antlr/TreeParserSharedInputState.java \
-  @abs_top_srcdir@/antlr/TreeSpecifierNode.java \
-  @abs_top_srcdir@/antlr/TreeWalkerGrammar.java \
-  @abs_top_srcdir@/antlr/Utils.java \
-  @abs_top_srcdir@/antlr/WildcardElement.java \
-  @abs_top_srcdir@/antlr/ZeroOrMoreBlock.java \
-  @abs_top_srcdir@/antlr/build/ANTLR.java \
-  @abs_top_srcdir@/antlr/build/StreamScarfer.java \
-  @abs_top_srcdir@/antlr/build/Tool.java \
-  @abs_top_srcdir@/antlr/collections/AST.java \
-  @abs_top_srcdir@/antlr/collections/ASTEnumeration.java \
-  @abs_top_srcdir@/antlr/collections/Enumerator.java \
-  @abs_top_srcdir@/antlr/collections/List.java \
-  @abs_top_srcdir@/antlr/collections/Stack.java \
-  @abs_top_srcdir@/antlr/collections/impl/ASTArray.java \
-  @abs_top_srcdir@/antlr/collections/impl/ASTEnumerator.java \
-  @abs_top_srcdir@/antlr/collections/impl/BitSet.java \
-  @abs_top_srcdir@/antlr/collections/impl/IndexedVector.java \
-  @abs_top_srcdir@/antlr/collections/impl/IntRange.java \
-  @abs_top_srcdir@/antlr/collections/impl/LLCell.java \
-  @abs_top_srcdir@/antlr/collections/impl/LLEnumeration.java \
-  @abs_top_srcdir@/antlr/collections/impl/LList.java \
-  @abs_top_srcdir@/antlr/collections/impl/Vector.java \
-  @abs_top_srcdir@/antlr/collections/impl/VectorEnumeration.java \
-  @abs_top_srcdir@/antlr/collections/impl/VectorEnumerator.java \
-  @abs_top_srcdir@/antlr/debug/DebuggingCharScanner.java \
-  @abs_top_srcdir@/antlr/debug/DebuggingInputBuffer.java \
-  @abs_top_srcdir@/antlr/debug/DebuggingParser.java \
-  @abs_top_srcdir@/antlr/debug/Event.java \
-  @abs_top_srcdir@/antlr/debug/GuessingEvent.java \
-  @abs_top_srcdir@/antlr/debug/InputBufferAdapter.java \
-  @abs_top_srcdir@/antlr/debug/InputBufferEvent.java \
-  @abs_top_srcdir@/antlr/debug/InputBufferEventSupport.java \
-  @abs_top_srcdir@/antlr/debug/InputBufferListener.java \
-  @abs_top_srcdir@/antlr/debug/InputBufferReporter.java \
-  @abs_top_srcdir@/antlr/debug/LLkDebuggingParser.java \
-  @abs_top_srcdir@/antlr/debug/ListenerBase.java \
-  @abs_top_srcdir@/antlr/debug/MessageAdapter.java \
-  @abs_top_srcdir@/antlr/debug/MessageEvent.java \
-  @abs_top_srcdir@/antlr/debug/MessageListener.java \
-  @abs_top_srcdir@/antlr/debug/NewLineEvent.java \
-  @abs_top_srcdir@/antlr/debug/NewLineListener.java \
-  @abs_top_srcdir@/antlr/debug/ParseTreeDebugParser.java \
-  @abs_top_srcdir@/antlr/debug/ParserAdapter.java \
-  @abs_top_srcdir@/antlr/debug/ParserController.java \
-  @abs_top_srcdir@/antlr/debug/ParserEventSupport.java \
-  @abs_top_srcdir@/antlr/debug/ParserListener.java \
-  @abs_top_srcdir@/antlr/debug/ParserMatchAdapter.java \
-  @abs_top_srcdir@/antlr/debug/ParserMatchEvent.java \
-  @abs_top_srcdir@/antlr/debug/ParserMatchListener.java \
-  @abs_top_srcdir@/antlr/debug/ParserReporter.java \
-  @abs_top_srcdir@/antlr/debug/ParserTokenAdapter.java \
-  @abs_top_srcdir@/antlr/debug/ParserTokenEvent.java \
-  @abs_top_srcdir@/antlr/debug/ParserTokenListener.java \
-  @abs_top_srcdir@/antlr/debug/SemanticPredicateAdapter.java \
-  @abs_top_srcdir@/antlr/debug/SemanticPredicateEvent.java \
-  @abs_top_srcdir@/antlr/debug/SemanticPredicateListener.java \
-  @abs_top_srcdir@/antlr/debug/SyntacticPredicateAdapter.java \
-  @abs_top_srcdir@/antlr/debug/SyntacticPredicateEvent.java \
-  @abs_top_srcdir@/antlr/debug/SyntacticPredicateListener.java \
-  @abs_top_srcdir@/antlr/debug/TraceAdapter.java \
-  @abs_top_srcdir@/antlr/debug/TraceEvent.java \
-  @abs_top_srcdir@/antlr/debug/TraceListener.java \
-  @abs_top_srcdir@/antlr/debug/Tracer.java \
-  @abs_top_srcdir@/antlr/debug/misc/ASTFrame.java \
-  @abs_top_srcdir@/antlr/preprocessor/Grammar.java \
-  @abs_top_srcdir@/antlr/preprocessor/GrammarFile.java \
-  @abs_top_srcdir@/antlr/preprocessor/Hierarchy.java \
-  @abs_top_srcdir@/antlr/preprocessor/Option.java \
-  @abs_top_srcdir@/antlr/preprocessor/Preprocessor.java \
-  @abs_top_srcdir@/antlr/preprocessor/PreprocessorLexer.java \
-  @abs_top_srcdir@/antlr/preprocessor/PreprocessorTokenTypes.java \
-  @abs_top_srcdir@/antlr/preprocessor/Rule.java \
-  @abs_top_srcdir@/antlr/preprocessor/Tool.java \
-        $(eol)
-
-antlr_swing_FILES = \
-        @abs_top_srcdir@/antlr/debug/misc/JTreeASTModel.java \
-  @abs_top_srcdir@/antlr/debug/misc/JTreeASTPanel.java \
-  $(eol)
+## When using stdmake  before  any other rule, then the default
+## rule is "all"  and  behaviour  of  make is first to make all
+## subdirectories  and then all "local"  targets with name all,
+## clean, install, test etc.
+## Sometimes it's usefull to make the local target first and then
+## subdirs. To  enforce  this, just listen target in question be-
+## fore "stdmake". By doing so, your target will become the
+## default. This is usually not what you want. Therefore introduce
+## a pseude rule (like this) to tell make about the default target.
+this : all
 
 
-## damned ugly hack ..
-#ifeq (gcj,@javac@)
-#       antlr_java_FILES = $(antlr_java1_FILES)
-#else
-        antlr_java_FILES = $(antlr_java1_FILES) $(antlr_swing_FILES)
-#endif
+## get standard make rules from autoconf
+@stdmake@
 
-## rule how to compile java files 
-@ANTLR_JAR@ :: $(antlr_java_FILES)
-        @ -@RMF@ $@
-        @ @JAVA_COMPILE_CMD@ $?
-        @ @JAR_CMD@ $@ antlr
-        @ test -f $@ || { exit 1; }
+test clean distclean install ::
+        @ if test -f examples/Makefile ; then \
+                @MAKE@ -C examples $@ ; \
+        fi
 
-## how ANTLR grammar files ..
-$(antlr_java_action_FILES) : @abs_top_srcdir@/antlr/actions/java/action.g
-        @cd actions/java && @ANTLR_COMPILE_CMD@ $<
+# Rule  to  remove  all objects, cores, ANTLR generated,
+# configure generated, etc. This is not a recursive rule
+# because distclean removes files unconditionally
+# included by subdirectory Makefiles.
+#
+maintainer-clean: distclean
+        -@RMF@ -f configure
 
-$(antlr_cpp_action_FILES) : @abs_top_srcdir@/antlr/actions/cpp/action.g
-        @cd actions/cpp && @ANTLR_COMPILE_CMD@ $<
+#
+# Rule to make a tarball exclusive all kinds of fluff
+#
 
-$(antlr_csharp_action_FILES) : @abs_top_srcdir@/antlr/actions/csharp/action.g
-        @cd actions/csharp && @ANTLR_COMPILE_CMD@ $<
+TIMESTAMP       = $(shell date +%Y%m%d)
+TAR_DIR         = $(versioneddir)
+TAR_FILE              = $(versioneddir).tar
 
-$(antlr_python_action_FILES) : @abs_top_srcdir@/antlr/actions/python/action.g
-        @cd actions/python && @ANTLR_COMPILE_CMD@ $<
+_tar:
+        -@RMF@ $(TAR_DIR)
+        ln -s $(srcdir) $(TAR_DIR)
+        $(TAR) cfh $(TAR_FILE) \
+                                --exclude CVS \
+                                --exclude *.pyc \
+                                --exclude *.o \
+                                --exclude *.d \
+                                --exclude *.lo \
+                                --exclude *.a \
+                                --exclude *.la \
+                                --exclude *.lai \
+                                --exclude *.so \
+                                --exclude *.class \
+                                --exclude .deps \
+                                --exclude .depend \
+                                --exclude config.cache \
+                                --exclude config.status \
+                                --exclude Config.make \
+                                --exclude antlr-config \
+                                --exclude run-antlr \
+                                --exclude *~ \
+                                --exclude core \
+                                --exclude dmalloc.log \
+                                --exclude .gdb_history \
+                                --exclude ".nfs*" \
+                                --exclude "$(TAR_DIR)/gen_doc/html" \
+                                --exclude "$(TAR_DIR)/gen_doc/html/*" \
+                                --exclude Makefile \
+                                $(TAR_DIR)
+        @CHMOD@ 660 $(TAR_FILE)
+        @RMF@ $(TAR_DIR)
 
-$(antlr_python_code_FILES) : @abs_top_srcdir@/antlr/actions/python/code.g
-        @cd actions/python && @ANTLR_COMPILE_CMD@ $<
+tar backup : _tar
+        gzip -f --best $(TAR_FILE)
 
-$(antlr_antlr_FILES) : @abs_top_srcdir@/antlr/antlr.g
-        @ANTLR_COMPILE_CMD@ $<
+## When building a release, it's crucial that time stamps are up-to-date and that
+## files have proper permission bit set. Since $(srcdir) might be under the 
+## control of Perforce (or an other versioning system), I'm going to unpack the
+## tar file again in a local directory and update time stamps as well as 
+## permission.
+release : @ANTLR_JAR@ _tar
+        @TAR@ xpf $(TAR_FILE)
+        @CP@ @ANTLR_JAR@ $(TAR_DIR)
+        find $(TAR_DIR) -type f | xargs @CHMOD@ 644
+        find $(TAR_DIR) -type d | xargs @CHMOD@ 755
+        @CHMOD@ 777 $(TAR_DIR)/configure
+        find $(TAR_DIR) | xargs @TOUCH@
+        find $(TAR_DIR)/antlr -name \*.java | xargs @TOUCH@
+        @TAR@ cf $(TAR_FILE) $(TAR_DIR)
+        gzip -f --best $(TAR_FILE)
+        gzip -t -v $(TAR_FILE).gz
+        @RMF@ $(TAR_DIR)
 
-$(antlr_tokdef_FILES) : @abs_top_srcdir@/antlr/tokdef.g
-        @ANTLR_COMPILE_CMD@ $<
+## This one for RK:
+new_version antlr/Version.java:
+        @@ECHO@ "Rebuilding Version.java"
+        @@ECHO@ "package antlr;"  > antlr/Version.java
+        @@ECHO@ "public class Version {"  >> antlr/Version.java
+        @@ECHO@ " public static final String version    = \"$(VERSION)\";"  >> antlr/Version.java
+        @@ECHO@ " public static final String subversion = \"$(SUBVERSION)\";"  >> antlr/Version.java
+        @@ECHO@ " public static final String patchlevel = \"$(PATCHLEVEL)\";"  >> antlr/Version.java
+        @@ECHO@ " public static final String datestamp  = \"$(TIMESTAMP)\";"  >> antlr/Version.java
+        @@ECHO@ " public static final String project_version = \"$(VERSION).$(SUBVERSION).$(PATCHLEVEL) ($(TIMESTAMP))\";"  >> antlr/Version.java
+        @@ECHO@ "}"  >> antlr/Version.java
 
-clean ::
-        @RMF@ *.class antlr @ANTLR_JAR@
+## Installation is delegated to sub directories - as configured.
+## Here we  just  create  a  bin  directory that should contain
+## scripts to mess up with ANTLR. Other things to do?
+
+docdir   = $(datadir)/doc/$(versioneddir)
+extradir = $(datadir)/$(versioneddir)
+
+install ::
+        $(MKDIR) -p "$(bindir)"
+        $(MKDIR) -p "$(extradir)"
+        $(MKDIR) -p "$(docdir)"
+        $(INSTALL) -m 755 scripts/run-antlr                          "$(bindir)/antlr"
+        $(INSTALL) -m 755 scripts/antlr-config                       "$(bindir)/antlr-config"
+        $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el      "$(extradir)"
+        $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml    "$(extradir)"
+        $(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt               "$(docdir)"
+        $(INSTALL) -m 444 @abs_top_srcdir@/README.txt                "$(docdir)"
+        $(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt               "$(docdir)"
+
+install ::
+        @ECHO@ "installation done"
+
+# Make sure that all generated files are removed
+distclean_obj = \
+ config.* \
+ Makefile \
+ scripts/antlr-config \
+ scripts/antlr.sh \
+ scripts/antlr.spec \
+ scripts/config.deps \
+ scripts/config.make \
+ scripts/config.vars \
+ scripts/cpp.sh \
+ scripts/csc.sh \
+ scripts/c.sh \
+ scripts/cxx.sh \
+ scripts/jar.sh \
+ scripts/javac.sh \
+ scripts/java.sh \
+ scripts/lib.sh \
+ scripts/link.sh \
+ scripts/pyantlr.sh \
+ scripts/python.sh \
+ scripts/run-antlr \
+ $(eof)
 
 distclean :: clean
-        @RMF@ $(antlr_gen_FILES)
+        @RMF@ $(distclean_obj)
+        Q=`find . -name Makefile` && test -n "$$Q" && @RMF@ $${Q}
 
-## install antlr.jar in libdirectory if exists
-install ::      @ANTLR_JAR@ 
-        -$(MKDIR) -p "$(libdir)"
-        -$(MKDIR) -p "$(datadir)/$(versioneddir)"
-        -test -f @ANTLR_JAR@ && {\
-         $(INSTALL) -m 444 @ANTLR_JAR@ "$(datadir)/$(versioneddir)" ; \
-         $(INSTALL) -m 444 @ANTLR_JAR@ "$(libdir)" ; \
-        }
-
-distclean :: clean
-        @RMF@ Makefile Version.java
-
-## get configured dependencies
+### phony targets - make this targets even if file with same name exists.
+.PHONY: bootstrap backup maintainer-clean
+##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 @stddeps@
-
-
+##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/yao/share/antlr-2.7.7/antlr/Version.java

@@ -5 +5 @@
         public static final String subversion = "7";
         public static final String patchlevel = "7";
-        public static final String datestamp  = "20100304";
-        public static final String project_version = "2.7.7 (20100304)";
+        public static final String datestamp  = "20100305";
+        public static final String project_version = "2.7.7 (20100305)";
 }

trunk/yao/share/antlr-2.7.7/config.log

@@ -824 +824 @@
 SUBVERSION='7'
 TAR='/usr/bin/tar'
-TIMESTAMP='20100304'
+TIMESTAMP='20100305'
 TOUCH='/bin/touch'
 VERBOSE='0'
@@ -907 +907 @@
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by antlr config.status 2.7.7, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  CONFIG_FILES    = ./Makefile
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status -q
+
+on pc_assistance
+
+config.status:896: creating ./Makefile
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by antlr config.status 2.7.7, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  CONFIG_FILES    = lib/csharp/Makefile
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status -q
+
+on pc_assistance
+
+config.status:896: creating lib/csharp/Makefile

trunk/yao/share/antlr-2.7.7/config.status

@@ -673 +673 @@
 s,@PYTHON@,/usr/bin/python,;t t
 s,@SUBVERSION@,7,;t t
-s,@TIMESTAMP@,20100304,;t t
+s,@TIMESTAMP@,20100305,;t t
 s,@TOUCH@,/bin/touch,;t t
 s,@VERBOSE@,0,;t t

trunk/yao/share/antlr-2.7.7/lib/csharp/Makefile

@@ -10 +10 @@
 
 ## helper utilities ..
-INSTALL         = /usr/bin/install -c
-MKDIR           = /bin/mkdir
-RM              = /bin/rm -r -f
-RMF             = /bin/rm -r -f
-TAR             = /bin/tar
+INSTALL         = /usr/bin/ginstall -c
+MKDIR           = /usr/bin/mkdir
+RM              = /usr/bin/rm -r -f
+RMF             = /usr/bin/rm -r -f
+TAR             = /usr/bin/tar
 TOUCH           = /bin/touch
-CHMOD           = /bin/chmod
-SED             = /bin/sed
-GREP            = /bin/grep
-CAT             = /bin/cat
-CHMOD           = /bin/chmod
+CHMOD           = /usr/bin/chmod
+SED             = /usr/bin/sed
+GREP            = /usr/bin/grep
+CAT             = /usr/bin/cat
+CHMOD           = /usr/bin/chmod
 CP              = /bin/cp
 ECHO            = /bin/echo
@@ -43 +43 @@
 host_alias      = 
 target_alias    = 
-build           = x86_64-unknown-linux-gnu
-build_cpu       = x86_64
-build_vendor    = unknown
+build           = i686-pc-linux-gnu
+build_cpu       = i686
+build_vendor    = pc
 build_os        = linux-gnu
-host            = x86_64-unknown-linux-gnu
-host_cpu        = x86_64
-host_vendor     = unknown
+host            = i686-pc-linux-gnu
+host_cpu        = i686
+host_vendor     = pc
 host_os         = linux-gnu
 just_make       = /usr/bin/make
@@ -62 +62 @@
 
 # navigation 
-builddir        = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-buildtree       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-sourcetree      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+builddir        = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
+buildtree       = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
+sourcetree      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 
 ## Two abbrevs to shorten things. $(thisdir) shall be the current
@@ -70 +70 @@
 ## source dir companion. That means that  $(thisdir)/Makefile has
 ## been generated by $(_srcdir)/Makefile.in.
-_srcdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
-thisdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$(subdir)
+_srcdir         = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
+thisdir         = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$(subdir)
 
 # variable 'srcdir' is deprecated - use sourcetree
-srcdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+srcdir          = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 # variable 'objdir' is deprecated - use buildtree
-objdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
+objdir          = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7
 
 # other
@@ -84 +84 @@
 SUBDIRS_NOT    := .
 
-CLR            = /usr/bin/mono
-
-ANTLR_JAR      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
-ANTLR_LIB      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
-ANTLR_NET      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
-ANTLR_PY       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
-ASTFRAME_NET   = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
+CLR            = 
+
+ANTLR_JAR      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
+ANTLR_LIB      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
+ANTLR_NET      = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
+ANTLR_PY       = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
+ASTFRAME_NET   = /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
 
 antlr_jar      = antlr.jar
@@ -202 +202 @@
 .SUFFIXES:
 
-Makefile :: /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status
+Makefile :: /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
+            /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
+                                          /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make \
+                                          /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
+            /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/config.status
         @echo "*** update $(subdir)/Makefile"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../configure
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/config.status : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../configure
         @echo "*** reconfigure $@ - stay tuned .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
         @echo "*** update all configured files .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
 
 ### In a pure devel mode there should be also a dependency listed on how
@@ -240 +240 @@
 ###
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
+
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
+        /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
 
 
@@ -304 +304 @@
 ## variable $(subdir) proper.
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
         @ subdir="lib/csharp/antlr.runtime" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -315 +315 @@
     esac
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
         @ subdir="lib/csharp/antlr.astframe" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -327 +327 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
         @ subdir="antlr" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -339 +339 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
+/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
         @ subdir="lib/cpp/src" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/sub_3/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \

trunk/yao/share/antlr-2.7.7/lib/csharp/antlr.astframe/Makefile

@@ -57 +57 @@
 
 # navigation 
-builddir        = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-buildtree       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
-sourcetree      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+builddir        = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7
+buildtree       = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7
+sourcetree      = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 
 ## Two abbrevs to shorten things. $(thisdir) shall be the current
@@ -65 +65 @@
 ## source dir companion. That means that  $(thisdir)/Makefile has
 ## been generated by $(_srcdir)/Makefile.in.
-_srcdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
-thisdir         = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$(subdir)
+_srcdir         = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)
+thisdir         = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/$(subdir)
 
 # variable 'srcdir' is deprecated - use sourcetree
-srcdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/..
+srcdir          = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/..
 # variable 'objdir' is deprecated - use buildtree
-objdir          = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7
+objdir          = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7
 
 # other
@@ -81 +81 @@
 CLR            = /usr/bin/mono
 
-ANTLR_JAR      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
-ANTLR_LIB      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
-ANTLR_NET      = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
-ANTLR_PY       = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
-ASTFRAME_NET   = /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
+ANTLR_JAR      = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar
+ANTLR_LIB      = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a
+ANTLR_NET      = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
+ANTLR_PY       = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/python/antlr/python.py
+ASTFRAME_NET   = /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
 
 antlr_jar      = antlr.jar
@@ -120 +120 @@
 ## by adding the  process  id  to  the filename. Finally we copy 
 ## and remove temporaries.
- antlr.astframe.dll : $(antlr_cs_FILES) /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
+ antlr.astframe.dll : $(antlr_cs_FILES) /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll
         @-/bin/rm -r -f $@
-        @ /bin/sh /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/csc.sh  $@ $(antlr_cs_FILES)
+        @ /bin/sh /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/csc.sh  $@ $(antlr_cs_FILES)
         @test -f $@ || exit 1
-        @ /bin/cp $@ $@.$$$$ && /bin/rm -r -f /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll ; \
-                /bin/cp $@.$$$$ /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll ; \
-                /bin/cp /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll $@ ; \
+        @ /bin/cp $@ $@.$$$$ && /bin/rm -r -f /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll ; \
+                /bin/cp $@.$$$$ /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll ; \
+                /bin/cp /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll $@ ; \
           /bin/rm -r -f $@.$$$$
 
 clean ::
-        /bin/rm -r -f *.obj *.o *.a  *.lib *.so *.dll *~ antlr.astframe.dll /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
+        /bin/rm -r -f *.obj *.o *.a  *.lib *.so *.dll *~ antlr.astframe.dll /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll
 
 distclean :: clean
@@ -136 +136 @@
 
 ## install our target ..
-install :: /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll 
+install :: /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll 
         @$(MKDIR) -p "$(libdir)"
         @/bin/echo "install C# core files .. "
-        @for f in /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll  ; do \
+        @for f in /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll  ; do \
                 /bin/echo "install $${f}" ; \
                 if test -f "$${f}" ; then \
@@ -149 +149 @@
 ## dependencies
 antlr.astframe.dll        : Makefile
-antlr.astframe.dll        : /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/csc.sh
+antlr.astframe.dll        : /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/csc.sh
 
 ## other dependencies to be listed below
@@ -166 +166 @@
 .SUFFIXES:
 
-Makefile :: /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make \
-                                          /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
-            /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status
+Makefile :: /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../$(subdir)/Makefile.in  \
+            /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps \
+                                          /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make \
+                                          /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars \
+            /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/config.status
         @echo "*** update $(subdir)/Makefile"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/config.status : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../configure
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES="$(subdir)/Makefile" /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.deps : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.deps.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.deps /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.make : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.make.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.make /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/config.vars : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/config.vars.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/config.vars /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/config.status : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../configure
         @echo "*** reconfigure $@ - stay tuned .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q --recheck
         @echo "*** update all configured files .."
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && /bin/sh ./config.status -q
 
 ### In a pure devel mode there should be also a dependency listed on how
@@ -204 +204 @@
 ###
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
-
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
-        /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
-        @echo "*** update $@"
-        @cd /home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/antlr.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/antlr.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/antlr.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/cpp.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cpp.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cpp.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/csc.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/csc.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/csc.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/cxx.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/cxx.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/cxx.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/jar.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/jar.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/jar.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/javac.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/javac.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/javac.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/java.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/java.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/java.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/lib.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/lib.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/lib.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/link.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/link.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/link.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/pyinst.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/pyinst.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/pyinst.sh /bin/sh ./config.status -q
+
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/python.sh : \
+        /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/scripts/../scripts/python.sh.in
+        @echo "*** update $@"
+        @cd /mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7 && CONFIG_FILES=scripts/python.sh /bin/sh ./config.status -q
 
 
@@ -268 +268 @@
 ## variable $(subdir) proper.
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.runtime.dll :: 
         @ subdir="lib/csharp/antlr.runtime" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -279 +279 @@
     esac
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/antlr.astframe.dll :: 
         @ subdir="lib/csharp/antlr.astframe" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -291 +291 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/antlr/antlr.jar ::
         @ subdir="antlr" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \
@@ -303 +303 @@
 
 
-/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
+/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/lib/cpp/src/libantlr.a ::
         @ subdir="lib/cpp/src" ; \
     case $(subdir) in \
           $$subdir ) ;; \
-          * ) d="/home/lnalod/tmp/svnYAO2009-11-12/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
+          * ) d="/mnt/zip/tmp/svn/trunk/yao/share/antlr-2.7.7/$$subdir" ; \
         test -f "$$d/Makefile" && {  \
          /usr/bin/make -C "$$d" $@ ; \

trunk/yao/src/Translator.cpp

@@ -186 +186 @@
     this->theDisplay.display(theConnectionTable);
 
-
-        /*
-   for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {
-                cout << endl << tok_tab -> getName();
-                cout << endl << tok_tab -> getOrderPhase();
-                for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {
-                        cout << endl << "\t" << *tok_str;
-                }
-        }
-        */
-
-        Order  myOrder(&theModulTable); // To delete when the function automaticOrderGenerator will be created as static
-
-        myOrder.automaticOrderGenerator(projectName, theOrderTable, theModulTable, theConnectionTable, theSpaceTable);
-
-        /*
-        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {
-                cout << endl << tok_tab -> getName();
-                cout << endl << tok_tab -> getOrderPhase();
-                for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {
-                        cout << endl << "\t" << *tok_str;
-                }
-        }
-        */
+  // One order object Order instanciated to call automatic generation and order checking functions
+
+  Order myOrder(&theModulTable); 
+
+  // As an order object should be instanciated to populate the "orderTable" vector and a constructor can not be declared as static, the automatic generation function can not be declared as static 
+
+  myOrder.automaticOrderGenerator(projectName, theOrderTable, theModulTable, theConnectionTable, theSpaceTable);
+
+  // As many calls to the member functions of YAO objects are performed, and as a static function can only call static functions, the order checking can not be declared as static 
+
+  myOrder.checkOrder(projectName, theConnectionTable, theModulTable, theSpaceTable, theOperatorTable, theOrderTable);
 
   this->generateCode(implementation, theOrderTable);
@@ -215 +202 @@
   //Order o;
   //o.checkOrder();
-  Order::checkOrder(&theConnectionTable, &theModulTable, &theSpaceTable, &theOperatorTable, &theOrderTable);
+  // Order::checkOrder(&theConnectionTable, &theModulTable, &theSpaceTable, &theOperatorTable, &theOrderTable);
 
   this->generateCode(implementation, theFunctionTable);

trunk/yao/src/YAOObjects/Modul.cpp

@@ -528 +528 @@
 }
 
-
+//----------------   AJOUT CB : TEST DES DIRECTIVES ORDER  -------------------------
+
+
+void Modul::initLoopInfos()   { axisVal[0] = 0; axisNumber[0] = 0; loopId[0] = 0;
+                                axisVal[1] = 0; axisNumber[1] = 0; loopId[1] = 0;
+                                axisVal[2] = 0; axisNumber[2] = 0; loopId[2] = 0; }
+
+void Modul::setAxisVal(int numAxis, int axisValue)          { axisVal[numAxis]      = axisValue;       }
+void Modul::setAxisNumber(int numAxis, int thisAxisNumber)  { axisNumber[numAxis]   = thisAxisNumber;  }
+void Modul::setLoopId(int numLoop, int idLoop)              { loopId[numLoop]       = idLoop;          }
+void Modul::setSeqId(int seqId)                             { this -> seqId         = seqId;           }
+
+int  Modul::getAxisVal(int numDim)    { return axisVal[numDim];     }
+int  Modul::getAxisNumber(int numDim) { return axisNumber[numDim];  }
+int  Modul::getLoopId(int numDim)     { return loopId[numDim];      }
+int  Modul::getSeqId()                { return seqId;               }
+
+bool Modul::isSetAxis(int numAxis)    { for(int i = 0; i < 3; i++) { if(axisNumber[i] == numAxis) { return true; }  } return false; } 
+
+
+// --------------- FIN AJOUT CB : TEST DES DIRECTIVES ORDER  ------------------
+

trunk/yao/src/YAOObjects/Modul.hpp

@@ -724 +724 @@
       char charAxe1, charAxe2, charAxe3;
       string traj;  //!< The Trajectory name associated to the Module.
-  };
+
+
+//------- AJOUT CB : TEST DES DIRECTIVES ORDER -------- 
+
+public:
+
+void initLoopInfos();                                   // Initialisation of all informations (dummies values)
+
+void setAxisVal(int numAxis, int axisValue);
+void setAxisNumber(int numAxis, int thisAxisNumber);
+void setLoopId(int numLoop, int idLoop);
+void setSeqId(int seqId);
+
+int getAxisVal(int numDim);
+int getAxisNumber(int numDim);
+int getLoopId(int numDim);
+int getSeqId();
+
+bool isSetAxis(int numAxis);    // Ajout pour test de conformité des dimensions
+
+private:
+
+int axisVal[3];                 // Array of the dimension's direction path as they appear in the order statement
+int axisNumber[3];              // Array of the axis numbers as they appaere in the order statement
+int loopId[3];                  // Array of loops numbers 
+int seqId;                      // Sequential number of the modul
+
+//------ FIN AJOUT CB : TEST DES DIRECTIVES ORDER -------
+
+
+};
 } // End namespace yao.
 #endif //! YAO_CONTEXT_HPP_INCLUDED.

trunk/yao/src/YAOObjects/Order.cpp

@@ -290 +290 @@
 // --------------------------------------------------------------------------------------------------------------------------------
 
-void Order::checkOrder(Table<Connection> * theConnectionTable, Table<Modul> * theModulTable, 
-    Table<Space> * theSpaceTable , Table<Operator> * theOperatorTable, Table<Order> * theOrderTable){
-  //theModTable = aModulTable;
-  //theConnectionTable = aConnectionTable;
-  //theSpaceTable = aSpaceTable;
-  
-  setLoop(theConnectionTable, theModulTable, theSpaceTable, theOperatorTable, theOrderTable);
-int i;
+void Order::checkOrder(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>&  theSpaceTable , Table<Operator>&  theOperatorTable, Table<Order>& theOrderTable) {
+
+        setLoop(projectName, theConnectionTable, theModulTable, theSpaceTable, theOperatorTable, theOrderTable);
+
+        checkConnections(projectName, theConnectionTable, theModulTable, theSpaceTable); 
+
 }
-/*
+
 
 // Function for getting an iterator on the module given as parameter (tool function)
 // ---------------------------------------------------------------------------------
 
-Table<Modul>::iterator getModule(string nom) {
+Table<Modul>::iterator Order::getModule(string nom, Table<Modul>& theModulTable) {
 
         for(Table<Modul>::iterator tok_tab = theModulTable.begin(); tok_tab < theModulTable.end(); tok_tab++) {
@@ -314 +312 @@
 // -----------------------------------------------------------------------------------------------
 
-int getDimSize(string space, int dim) {
+int Order::getDimSize(string space, int dim, Table<Space>&  theSpaceTable) {
            for (Table<Operator>::iterator tok_space = theSpaceTable.begin(); tok_space != theSpaceTable.end(); ++tok_space) {
                 if(tok_space -> getName() == space) return tok_space -> getYA(dim + 1);
@@ -323 +321 @@
 // Function for getting informations about the loops and recording them in the dedicated data structures embedded inside the YAOObject "Module" 
 // --------------------------------------------------------------------------------------------------------------------------------------------
-*/
-void Order::setLoop(Table<Connection> * theConnectionTable, Table<Modul> * theModulTable, 
-    Table<Space> * theSpaceTable, Table<Operator> * theOperatorTable, Table<Order> * theOrderTable){
-}
-/*      string outLoopChecking = "LoopCheck_" + getFilename();
+
+void Order::setLoop(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>& theSpaceTable, Table<Operator>& theOperatorTable, Table<Order>& theOrderTable) {
+
+        string outLoopChecking = "." + projectName + "_loop_check";
+
         ofstream loopFile(outLoopChecking.c_str(), ios::out);
 
@@ -336 +334 @@
         int nbSpace;                                                                                            // Number of spaces encountered in the order statements
 
-for(Table<Order>::iterator tok_tab = theOrderTable->begin(); tok_tab < theOrderTable->end(); tok_tab++) {
-         if(tok_tab -> getOrderPhase() == 2) {
-                        nbTraj++; 
+        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {
+
+                if(tok_tab -> getOrderPhase() == 2) {
+
+                        nbTraj++;
+ 
                         nbSpace = 0;    
+
                         for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) { nbSpace++; } 
-                        }
-                        } 
-}                       
-string indexSpaceTraj[nbTraj][nbSpace];                                 // Table for storing spaces inside trajectories (used for ordonnancing the spaces as they are declared in the spaceintraj statements)
-
-for(int i = 0; i < nbTraj; i++) { for(int j = 0; j < nbSpace; j++) { indexSpaceTraj[i][j] = ""; } }  // Initialization of indexSpaceTraj table with zero length string 
-
-nbTraj =  0;
-
-for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {  // Reading of the order table for populating the indexSpaceTraj table
+
+                }
+        } 
+
+        string indexSpaceTraj[nbTraj][nbSpace]; // Table for storing spaces inside trajectories (used for ordonnancing the spaces as they are declared in the spaceintraj statements)
+
+        for(int i = 0; i < nbTraj; i++) { for(int j = 0; j < nbSpace; j++) { indexSpaceTraj[i][j] = ""; } }  // Initialization of indexSpaceTraj table with zero length string 
+
+        nbTraj =  0;
+
+        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {  // Reading of the order table for populating the indexSpaceTraj table
+
                 tok_tab->backOrder();                                                                    // For sorting the tokens as they appear in the description file
+
                 if(tok_tab -> getOrderPhase() == 2) {                                                    // If the table entry is a spaceintraj statement
+
                         nbTraj++;
+
                         nbSpace = 0;
+
                         for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {
+
                                    indexSpaceTraj[nbTraj -1][nbSpace++] = *tok_str;
                         }
-                        }
-                        } 
-
-for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {                                                 // For all entries in the tale Order
-        if(tok_tab -> getOrderPhase() == 1) {                                                                                                           // If the entry is a modinspace
-                for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {             // Read the vector of tokens
-                        if (*tok_str == "order") orderCmpt++;                                                                                
+                 }
+        } 
+
+        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {                                                 // For all entries in the tale Order
+
+                if(tok_tab -> getOrderPhase() == 1) {                                                                                                           // If the entry is a modinspace
+
+                        for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {             // Read the vector of tokens
+
+                                if (*tok_str == "order") orderCmpt++;                                                                                
                         }       
-                        }
-                        } 
+                }
+        } 
 
         int *nbTokens           = new int[orderCmpt];                                   // Number of "Y.." tokens (indexed by [no_loop])
@@ -379 +391 @@
 
 
-for(int i = 0; i < nbTraj; i++) {                                                                                                            // For all trajectories "i" indexed in indexSpaceTraj 
-     for(int j = 0; j < nbSpace; j++) {                                                                                                      // For all spaces "j" stored in the current trajectory "i"
-        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {                              // For all entries in the table Order
-            if(tok_tab -> getOrderPhase() == 1 && tok_tab -> getName() == indexSpaceTraj[i][j]) {                                            // If the entry is a modinspace and the space match indexSpaceTraj
-                for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {  // Read the vector of tokens
+        for(int i = 0; i < nbTraj; i++) {                                                                                               // For all trajectories "i" indexed in indexSpaceTraj 
+
+                for(int j = 0; j < nbSpace; j++) {                                                                                      // For all spaces "j" stored in the current trajectory "i"
+
+                        for(Table<Order>::iterator tok_tab = theOrderTable.begin(); tok_tab < theOrderTable.end(); tok_tab++) {         // For all entries in the table Order
+
+                                if(tok_tab -> getOrderPhase() == 1 && tok_tab -> getName() == indexSpaceTraj[i][j]) {                   // If the entry is a modinspace and the space match indexSpaceTraj
+
+                                        for(vector<string>::iterator tok_str = tok_tab -> orderTokens.begin(); tok_str < tok_tab -> orderTokens.end(); tok_str++) {  // Read the vector of tokens
 
 if (*tok_str == "order")        { loopOrder++; loopCmpt++; tokenCmpt = -1; }
@@ -395 +411 @@
 else                            {
 
-        getModule(*tok_str) -> initLoopInfos();                                         // Initialisation of all loops informations
-        modulCmpt++;                                                                    // Increment of the modules counter 
-        int tabIndex = -1;                                                              // Position Index in the module's tables 
-
-for(int i = 0; i <= loopOrder; i++) {
-        for(int j = 0; j < nbTokens[i]; j++) {
-                tabIndex++;
-                getModule(*tok_str) -> setSeqId(modulCmpt);
-                getModule(*tok_str) -> setAxisNumber(tabIndex, axisNumber[i][j]);
-                getModule(*tok_str) -> setAxisVal(tabIndex, directionPath[i][j]);
-                getModule(*tok_str) -> setLoopId(tabIndex, loopId[i][j]);
-                }
-                }
-
-
-
-                                }
-                                }
-                                }
-                                }
-                                }
-                                }
-                                } 
+                                 getModule(*tok_str, theModulTable) -> initLoopInfos();                         // Initialisation of all loops informations
+                                 modulCmpt++;                                                                   // Increment of the modules counter 
+                                 int tabIndex = -1;                                                             // Position Index in the module's tables 
+
+                                 for(int i = 0; i <= loopOrder; i++) {
+
+                                        for(int j = 0; j < nbTokens[i]; j++) {
+
+                                                                tabIndex++;
+                                                                getModule(*tok_str, theModulTable) -> setSeqId(modulCmpt);
+                                                                getModule(*tok_str, theModulTable) -> setAxisNumber(tabIndex, axisNumber[i][j]);
+                                                                getModule(*tok_str, theModulTable) -> setAxisVal(tabIndex, directionPath[i][j]);
+                                                                getModule(*tok_str, theModulTable) -> setLoopId(tabIndex, loopId[i][j]);
+                                        }
+                                }
+}
+                                        }
+                                }
+                        }
+                } 
+        } 
+} 
 
 
@@ -423 +438 @@
 // ---------------------------------------------------------------------------------------------- 
 
-void checkConnections() {
-
-        string outLoopChecking = "LoopCheck_" + getFilename();
+void Order::checkConnections(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>&  theSpaceTable) {
+
+        string outLoopChecking = "." + projectName + "_loop_check";
+
         fstream loopFile(outLoopChecking.c_str(), fstream::in | fstream::out | fstream::app);
 
@@ -432 +448 @@
         for(Table<Connection>::iterator tok_tab = theConnectionTable.begin(); tok_tab < theConnectionTable.end(); tok_tab++) {
 
-        if(tok_tab -> getT() == -1) { 
-        loopFile << endl << "Dropped T-1  : " << tok_tab -> getOutModule() << " (" << tok_tab -> getI() << "," << tok_tab -> getJ() << "," << tok_tab -> getK() << "," << tok_tab -> getT() <<  
-                ") ==> " << tok_tab -> getInModule();
-        } 
-
-        if(tok_tab -> getT() > -1) {                                                                            // Drop connection if the dependencies are not defined at current time
-
-        Table<Modul>::iterator itSource = getModule(tok_tab -> getOutModule());
-        Table<Modul>::iterator itTarget = getModule(tok_tab -> getInModule());
-
-        if(!itSource -> isCounterOrder() || !itTarget -> isCounterOrder()) { 
-        loopFile << endl << "Dropped Order : " << tok_tab -> getOutModule() << " (" << tok_tab -> getI() << "," << tok_tab -> getJ() << "," << tok_tab -> getK() << ") ==> " << tok_tab -> getInModule();
-        }
-
-        if(itSource -> isCounterOrder() && itTarget -> isCounterOrder())  {                                     // Drop connection if modules are not integrated in an order statement
-
-        if(itSource -> getTrajectory() != itTarget -> getTrajectory())    {
-        loopFile << endl << "Dropped Trajectory : " << tok_tab -> getOutModule() << " (" << tok_tab -> getI() << "," << tok_tab -> getJ() << "," << tok_tab -> getK() << ") ==> " << tok_tab -> getInModule();
-        }
-
-        if(itSource -> getTrajectory() == itTarget -> getTrajectory())    {                                     // Drop connection if modules are not in the same trajectory 
-        
-        int valCijk[3];
-
-        valCijk[0] = tok_tab -> getI();
-        valCijk[1] = tok_tab -> getJ();
-        valCijk[2] = tok_tab -> getK();
-        
-        loopFile << endl << endl << "Connexion : " << tok_tab -> getOutModule() << " (" << valCijk[0] << "," << valCijk[1] << "," << valCijk[2] <<") ==> " << tok_tab -> getInModule();
-        loopFile << "   (" <<  itSource -> getAxisNumber(0) << ", " <<  itSource -> getAxisNumber(1) << ", " <<  itSource -> getAxisNumber(2) << ")" << endl;
-        loopFile << "-----------------------------------------------" << endl;
-
-        // Compatibility test between the order statement and the dimensions of the source module
-
-        if(itSource -> isSetAxis(1) == true  && getDimSize(itSource -> getSpaceOrOperator(), 0) == 0) loopFile << endl << "Warning : computation of I dimension not necessary" << endl;
-        if(itSource -> isSetAxis(1) == false && getDimSize(itSource -> getSpaceOrOperator(), 0) > 0)  loopFile << endl << "Error   : dimension I must be computed" << endl;
-        if(itSource -> isSetAxis(2) == true  && getDimSize(itSource -> getSpaceOrOperator(), 1) == 0) loopFile << endl << "Warning : computation of J dimension not necessary" << endl;
-        if(itSource -> isSetAxis(2) == false && getDimSize(itSource -> getSpaceOrOperator(), 1) > 0 && itSource -> isInterYA(1) == false) loopFile << endl << "Error   : dimension J must be computed" << endl;
-        if(itSource -> isSetAxis(3) == true  && getDimSize(itSource -> getSpaceOrOperator(), 2) == 0) loopFile << endl << "Warning : computation of K dimension not necessary" << endl;
-        if(itSource -> isSetAxis(3) == false && getDimSize(itSource -> getSpaceOrOperator(), 2) > 0 && itSource -> isInterYA(2) == false) loopFile << endl << "Error   : dimension K must be computed" << endl;
-        // Data structures for testing absolute references
-        
-        bool absCijk[3];
-
-        absCijk[0] = false;      //  Flag indicating an absolute i value
-        absCijk[1] = false;      //  Flag indicating an absolute j value 
-        absCijk[2] = false;      //  Flag indicating an absolute k value
-        if(tok_tab -> getReli() == -1) { absCijk[0] = true; }  
-        if(tok_tab -> getRelj() == -1) { absCijk[1] = true; } 
-        if(tok_tab -> getRelk() == -1) { absCijk[2] = true; }  
-
-        int lastAxis = 2;                                                                                  // Without more informations, 3 axis are taken into account 
-        int Res = 0;                                                                                       // Res is initialised at 0, means there is no information about order validity 
-
-        for(int i = 0; i < 3; i++) {
-
-                if(Res != 0) break;                                             // If checkConnection() validate are invalidate the order statement for current connection, no further tests are needed 
-
-                        if(i < 3 && itSource -> getAxisNumber(i + 1) == 0) lastAxis = i;
-                        if(itSource -> getAxisNumber(i) > 0)
-                        Res = checkConnection(i, itSource, itTarget, valCijk, absCijk, lastAxis);
-
-                        }
-        }
-        }
-        }
-        }
+                // Drop connection if the dependencies are not defined at current time
+
+                if(tok_tab -> getT() == -1) { 
+        
+                        loopFile << endl << "Dropped T-1  : " << tok_tab -> getOutModule() << " (" << tok_tab -> getI() << "," << 
+                                                                                                      tok_tab -> getJ() << "," << 
+                                                                                                      tok_tab -> getK() << "," << 
+                                                                                                      tok_tab -> getT() << ") ==> " <<
+                                                                                                      tok_tab -> getInModule();
+                }
+
+                // Keep connection if the dependencies are not defined at current time
+
+        
+                if(tok_tab -> getT() > -1) {                                                                            
+
+                        Table<Modul>::iterator itSource = getModule(tok_tab -> getOutModule(), theModulTable);
+
+                        Table<Modul>::iterator itTarget = getModule(tok_tab -> getInModule(), theModulTable);
+
+
+                                // Drop connection if modules are not integrated in an order statement  
+
+                                if(!itSource -> isCounterOrder() || !itTarget -> isCounterOrder()) { 
+
+                                        loopFile << endl << "Dropped Order : " << tok_tab -> getOutModule() << " (" << 
+                                                                                  tok_tab -> getI() << "," << 
+                                                                                  tok_tab -> getJ() << "," << 
+                                                                                  tok_tab -> getK() << ") ==> " << 
+                                                                                  tok_tab -> getInModule();
+                                }
+
+                                // Keep connection if modules are not integrated in an order statement
+        
+                                if(itSource -> isCounterOrder() && itTarget -> isCounterOrder())  {                             
+                        
+                                        // Drop connection if modules are not in the same trajectory 
+        
+                                        if(itSource -> getTrajectory() != itTarget -> getTrajectory())    {
+
+                                                loopFile << endl << "Dropped Trajectory : " <<  tok_tab -> getOutModule() << " (" << 
+                                                                                                tok_tab -> getI() << "," << 
+                                                                                                tok_tab -> getJ() << "," << 
+                                                                                                tok_tab -> getK() << ") ==> " << 
+                                                                                                tok_tab -> getInModule();
+                                        }
+                                        
+                                        // Keep connection if modules are in the same trajectory
+
+                                        if(itSource -> getTrajectory() == itTarget -> getTrajectory())    {                                     
+        
+                                                int valCijk[3];
+
+                                                valCijk[0] = tok_tab -> getI();
+                                                valCijk[1] = tok_tab -> getJ();
+                                                valCijk[2] = tok_tab -> getK();
+        
+                                                loopFile << endl << endl << "Connexion : "      << tok_tab -> getOutModule() << " (" 
+                                                                                                << valCijk[0] << "," 
+                                                                                                << valCijk[1] << "," 
+                                                                                                << valCijk[2] <<") ==> " 
+                                                                                                << tok_tab -> getInModule();
+
+                                                loopFile << "   (" <<   itSource -> getAxisNumber(0) << ", " <<  
+                                                                        itSource -> getAxisNumber(1) << ", " <<  
+                                                                        itSource -> getAxisNumber(2) << ")" << endl;
+
+                                                loopFile << "-----------------------------------------------" << endl;
+
+                                                // Compatibility test between the order statement and the dimensions of the source module
+
+                                                if(itSource -> isSetAxis(1) == true  && getDimSize(itSource -> getSpaceOrOperator(), 0, theSpaceTable) == 0) { 
+
+                                                        loopFile << endl << "Warning : computation of I dimension not necessary" << endl;
+
+                                                }
+
+                                                if(itSource -> isSetAxis(1) == false && getDimSize(itSource -> getSpaceOrOperator(), 0, theSpaceTable) > 0) { 
+
+                                                         loopFile << endl << "Error   : dimension I must be computed" << endl;
+
+                                                }
+
+                                                if(itSource -> isSetAxis(2) == true  && getDimSize(itSource -> getSpaceOrOperator(), 1, theSpaceTable) == 0) { 
+
+                                                        loopFile << endl << "Warning : computation of J dimension not necessary" << endl;
+
+                                                }
+
+                                                if(itSource -> isSetAxis(2) == false && getDimSize(itSource -> getSpaceOrOperator(), 1, theSpaceTable) > 0 && itSource -> isInterYA(1) == false) { 
+
+                                                        loopFile << endl << "Error   : dimension J must be computed" << endl;
+                
+                                                }
+
+                                                if(itSource -> isSetAxis(3) == true  && getDimSize(itSource -> getSpaceOrOperator(), 2, theSpaceTable) == 0) { 
+
+                                                        loopFile << endl << "Warning : computation of K dimension not necessary" << endl;
+
+                                                }
+
+                                                if(itSource -> isSetAxis(3) == false && getDimSize(itSource -> getSpaceOrOperator(), 2, theSpaceTable) > 0 && itSource -> isInterYA(2) == false) { 
+
+                                                        loopFile << endl << "Error   : dimension K must be computed" << endl;
+
+                                                }
+        
+
+                                                // Data structures for testing absolute references
+        
+                                                bool absCijk[3];
+
+                                                absCijk[0] = false;      //  Flag indicating an absolute i value
+                                                absCijk[1] = false;      //  Flag indicating an absolute j value 
+                                                absCijk[2] = false;      //  Flag indicating an absolute k value
+
+                                                if(tok_tab -> getReli() == -1) { absCijk[0] = true; }  
+                                                if(tok_tab -> getRelj() == -1) { absCijk[1] = true; } 
+                                                if(tok_tab -> getRelk() == -1) { absCijk[2] = true; }  
+
+        
+                                                int lastAxis = 2;    // Without more informations, 3 axis are taken into account 
+                                                int Res = 0;         // Res is initialised at 0, means there is no information about order validity 
+
+                                                for(int i = 0; i < 3; i++) {
+
+                                                        if(Res != 0) break; // If checkConnection() validate are invalidate the order statement for current connection, no further tests are needed 
+
+                                                        if(i < 3 && itSource -> getAxisNumber(i + 1) == 0) lastAxis = i;
+                                                        if(itSource -> getAxisNumber(i) > 0) Res = checkConnection(projectName, i, itSource, itTarget, valCijk, absCijk, lastAxis, theSpaceTable);
+
+                                                }
+
+                                        }       // If moduls are in the same trajectory
+
+                                }       // If moduls are in an order statement
+
+                        }       // If modules are computes at the same time
+
+                }       // Next connection
+        
         loopFile.close();
-        }
+}
 
 
@@ -507 +597 @@
 // -------------------------------------------------------------------------------
 
-bool checkConnection(int numDim, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget, int valCijk[3], bool absCijk[3], int lastAxis)  {
-
-        string outLoopChecking = "LoopCheck_" + getFilename();
+bool Order::checkConnection(string projectName, int numDim, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget, int valCijk[3], bool absCijk[3], int lastAxis, Table<Space>&  theSpaceTable)  {
+
+        string outLoopChecking = "." + projectName + "_loop_check";
+
         fstream loopFile(outLoopChecking.c_str(), fstream::in | fstream::out | fstream::app);
 
         loopFile << endl << "checkConnection(" << numDim << ")";
 
-// If modules are not in the same loop for the current dimension, then the odering of modules is checked
-
-        if(itSource -> getLoopId(numDim) != itTarget -> getLoopId(numDim)) {  loopFile << " Séquence : 1 => 2 "; return checkModOrder(itSource, itTarget);   }
+        // If modules are not in the same loop for the current dimension, then the odering of modules is checked
+
+        if(itSource -> getLoopId(numDim) != itTarget -> getLoopId(numDim)) {  loopFile << " Séquence : 1 => 2 "; return checkModOrder(projectName, itSource, itTarget);   }
 
  
-// Else, check if the value for current dimension is an absolute one and, if so, test the validity of the order
-
-
-string  msgWarning = " (Warning: Absolute reference can not be satisfied)";
-
-if(absCijk[itSource -> getAxisNumber(numDim) - 1] == true) {
-
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 2 && numDim != lastAxis) { loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << endl; return 0; }
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 2 && numDim == lastAxis) { loopFile << " Séquence : 1 => 3 => 4 => 5 => 2";  return  checkModOrder(itSource, itTarget);  }
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 1 && numDim != lastAxis) { loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K.(dim)" << msgWarning << endl; return 0; }
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 1 && numDim == lastAxis) { loopFile << " Séquence : 1 => 3 => 4 => 5 => 2" << msgWarning; return  checkModOrder(itSource, itTarget);  }
-
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > getDimSize(itSource -> getSpaceOrOperator(), numDim) - 2 && numDim != lastAxis) { 
-                                                                                                                loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << endl; 
-                                                                                                                return 0;  
-                                                                                                                }
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > getDimSize(itSource -> getSpaceOrOperator(), numDim) - 2 && numDim == lastAxis) { 
-                                                                                                                loopFile << " Séquence : 1 => 3 => 4 => 5 => 2"; 
-                                                                                                                return  checkModOrder(itSource, itTarget); 
-                                                                                                                }
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < getDimSize(itSource -> getSpaceOrOperator(), numDim) - 1 && numDim != lastAxis) {  
-                                                                                                                loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << msgWarning << endl; 
-                                                                                                                return 0;
-                                                                                                                }
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < getDimSize(itSource -> getSpaceOrOperator(), numDim) - 1 && numDim == lastAxis) {
-                                                                                                                loopFile << " Séquence : 1 => 3 => 4 => 5 => 2" << msgWarning;
-                                                                                                                return  checkModOrder(itSource, itTarget);
-                                                                                                                }
-
-}
-
-
-// Else, if modules are in the same node for the current dimension
-
-if(valCijk[itSource -> getAxisNumber(numDim) - 1] == 0) {
+        // Else, check if the value for current dimension is an absolute one and, if so, test the validity of the order
+
+        string  msgWarning = " (Warning: Absolute reference can not be satisfied)";
+
+        if(absCijk[itSource -> getAxisNumber(numDim) - 1] == true) {
+
+                if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 2 && numDim != lastAxis) { 
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << endl; return 0;
+
+                 }
+
+                if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 2 && numDim == lastAxis) { 
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => 2";  return  checkModOrder(projectName, itSource, itTarget);  
+
+                }
+
+                if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 1 && numDim != lastAxis) { 
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K.(dim)" << msgWarning << endl; return 0; 
+
+                }
+
+                if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 1 && numDim == lastAxis) { 
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => 2" << msgWarning; return  checkModOrder(projectName, itSource, itTarget);  
+
+                }
+
+                if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > getDimSize(itSource -> getSpaceOrOperator(), numDim, theSpaceTable) - 2 && numDim != lastAxis) { 
+                                                                                                                
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << endl; 
+                        return 0;  
+        
+                }
+
+                if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > getDimSize(itSource -> getSpaceOrOperator(), numDim, theSpaceTable) - 2 && numDim == lastAxis) { 
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => 2"; 
+                        return  checkModOrder(projectName, itSource, itTarget); 
+        
+                }
+
+                if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < getDimSize(itSource -> getSpaceOrOperator(), numDim, theSpaceTable) - 1 && numDim != lastAxis) {
+  
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => O.K. (dim)" << msgWarning << endl; 
+                        return 0;
+
+                }
+
+                if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < getDimSize(itSource -> getSpaceOrOperator(), numDim, theSpaceTable) - 1 && numDim == lastAxis) {
+                                                                                                                
+
+                        loopFile << " Séquence : 1 => 3 => 4 => 5 => 2" << msgWarning;
+                        return  checkModOrder(projectName, itSource, itTarget);
+                }
+
+        }
+
+
+        // Else, if modules are in the same node for the current dimension
+
+        if(valCijk[itSource -> getAxisNumber(numDim) - 1] == 0) {
 
 
@@ -562 +682 @@
                 // Else the odering of modules is checked 
 
-                else   { loopFile << " Séquence : 1 => 3 => 6 => 5 => 2"; return checkModOrder(itSource, itTarget);  }
-
-                }
-
-
-// Else, test the validity between order statements and connections 
-
-
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => O.K." << endl; return 1;  }
-if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => K.O." << endl; return -1; }
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => K.O." << endl; return -1; }
-if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => O.K." << endl; return 1;  }
-
-}
+                else   { loopFile << " Séquence : 1 => 3 => 6 => 5 => 2"; return checkModOrder(projectName, itSource, itTarget);  }
+
+        }
+
+
+        // Else, test the validity between order statements and connections 
+
+        if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => O.K." << endl; return 1;  }
+        if(itSource -> getAxisVal(numDim) < 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => K.O." << endl; return -1; }
+        if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] < 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => K.O." << endl; return -1; }
+        if(itSource -> getAxisVal(numDim) > 0 && valCijk[itSource -> getAxisNumber(numDim) - 1] > 0) { loopFile << " Séquences : 1 => 3 => 6 => 7 => O.K." << endl; return 1;  }
+
+} 
 
 // Function, called by checkConnection(), used for testing the ordering of the modules given as parameters
 // -------------------------------------------------------------------------------------------------------
 
-bool checkModOrder(Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget) {
-        
-        string outLoopChecking = "LoopCheck_" + getFilename();
+bool Order::checkModOrder(string projectName, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget) {
+
+        string outLoopChecking = "." + projectName + "_loop_check";
+
         fstream loopFile(outLoopChecking.c_str(), fstream::in | fstream::out | fstream::app);
 
@@ -590 +710 @@
 
 
-*/
+
 
 
@@ -597 +717 @@
 
 void Order::automaticOrderGenerator(string projectName, Table<Order>& theOrderTable, Table<Modul>& myModulTable, Table<Connection>& myConnectionTable, Table<Space>& mySpaceTable) {
+
+         vector<cfcStruct> outerComp;
+
+         middleCompType middleComp;
+
+         innerCompType innerComp;
+
+         myGraphType myGraph;
 
         // As the orderTable should be empty (because the generator is called), this clearing is just relevant in the testing phase 
@@ -603 +731 @@
         theOrderTable.clear(); 
 
-        Order myOrder(theModulTable);
+        // Order myOrder(&myModulTable);
 
         // Add a dot to the project name to hide the file
@@ -842 +970 @@
 
 
-                                myOrder.setOrderPhase(1);
-                                myOrder.setName(spaceName);
-                                myOrder.orderTokens.clear();
+                                // myOrder.setOrderPhase(1);
+                                // myOrder.setName(spaceName);
+                                // myOrder.orderTokens.clear();
 
                                 // myOrder.orderTokens.clear();
@@ -855 +983 @@
                                 // ---------------------------------------------
 
-                                // OBJ this -> setOrderPhase(1);
+                                this -> setOrderPhase(1);
                                 
                                 // Set the current space name
                                 // --------------------------
 
-                                // OBJ this -> setName(spaceName); 
+                                this -> setName(spaceName); 
 
                                 // Reset the orderTokens string vector
                                 // -----------------------------------
 
-                                // OBJ this -> orderTokens.clear();
+                                this -> orderTokens.clear();
 
                                 // Dedicated light structures that will be used to create the main graph then populate its properties 
@@ -1001 +1129 @@
                                         // ---------------------------------------------------------------------------------------------------------------------------------- 
 
-                                        setOuter();
+                                        setOuter(outerComp, middleComp, innerComp, myGraph);
 
                                         // Read the vector of 1D components to display the order statement (the two first dimensions have dummy values, then the third one is read as the first one) 
                                         // ---------------------------------------------------------------------------------------------------------------------------------------------------------
 
-                                        read1D(myOrder);
+                                        read1D(outerComp, middleComp, innerComp, myGraph);
 
                                         break;
@@ -1027 +1155 @@
                                         // ---------------------------------------------------------------------------------------------------------------------------------- 
 
-                                        setOuter();
+                                        setOuter(outerComp, middleComp, innerComp, myGraph);
 
                                         // Read the vector of 2D components to display the order statement (the first dimension have dummy value, then the second and third are read as the first and second)
                                         // ------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-                                        read2D(myOrder); 
+                                        read2D(outerComp, middleComp, innerComp, myGraph); 
+
+                                        
+
+                                        
 
                                         break;
@@ -1048 +1180 @@
                                         // ---------------------------------------------------------------------------------------------------------------------------------- 
 
-                                        setOuter();
+                                        setOuter(outerComp, middleComp, innerComp, myGraph);
 
                                         // Read the vector of 3D components
                                         // --------------------------------
 
-                                        read3D(myOrder);
+                                        read3D(outerComp, middleComp, innerComp, myGraph);
 
                                         break;
@@ -1072 +1204 @@
                                 // ------------------------------------------------------------------------------------------------------
 
-                                // OBJ theOrderTable.push_back(*this);
-
-                                theOrderTable.push_back(myOrder);
+                                theOrderTable.push_back(*this);
+
+                                // theOrderTable.push_back(myOrder);
 
                         }
@@ -1099 +1231 @@
                 hiddenFile << endl << endl << "order spaceintraj " << trajOrder[noTraj].second << endl << endl << "\t";
 
-                myOrder.setOrderPhase(2);
-                myOrder.setName(trajOrder[noTraj].second);
-                myOrder.orderTokens.clear();
+                // myOrder.setOrderPhase(2);
+                // myOrder.setName(trajOrder[noTraj].second);
+                // myOrder.orderTokens.clear();
                 // myOrder.orderTokens.clear();
 
@@ -1107 +1239 @@
                 // --------------------------------------------------
 
-                // OBJ this -> setOrderPhase(2); 
+                this -> setOrderPhase(2); 
 
                 // Set the trajectory name
                 // -----------------------
 
-                // OBJ this -> setName(trajOrder[noTraj].second); 
+                this -> setName(trajOrder[noTraj].second); 
 
                 // Clear the orderTokens vector of string 
                 // --------------------------------------
 
-                // OBJ this -> orderTokens.clear();
+                this -> orderTokens.clear();
 
 
@@ -1140 +1272 @@
                                         hiddenFile << trajMap.find(spacesList[noTopo]) -> first << " ";
 
-                                        myOrder.orderTokens.push_back(trajMap.find(spacesList[noTopo]) -> first);
+                                        // myOrder.orderTokens.push_back(trajMap.find(spacesList[noTopo]) -> first);
 
                                         // Insert the current trajectory name in the order tokens vector  
                                         // -------------------------------------------------------------
 
-                                        // OBJ this -> orderTokens.push_back(trajMap.find(spacesList[noTopo]) -> first);
+                                        this -> orderTokens.push_back(trajMap.find(spacesList[noTopo]) -> first);
                         }
                 }
@@ -1160 +1292 @@
         // ------------------------------------------------------------------------------------------------------- 
 
-        // OBJ theOrderTable.push_back(*this);
-
-        theOrderTable.push_back(myOrder);
+        theOrderTable.push_back(*this);
+
+        // theOrderTable.push_back(myOrder);
 
         }
@@ -1174 +1306 @@
 
 
-
-Table<Modul>::iterator Order::getModule(string nom, Table<Modul>& myModulTable) {
-
-        for(Table<Modul>::iterator tok_tab = myModulTable.begin(); tok_tab < myModulTable.end(); tok_tab++) {
-        if(tok_tab->getName() == nom) return tok_tab;
-        }
-        };
-
-
 int Order::getModulIndex(string mod, const vector<string>& tab, int index) { for(int i = 0; i < index; i++) if(tab[i] == mod) return i; }
-
 
 void Order::to3D(int nbDim, vector<int>& valCi, vector<int>& valCj, vector<int>& valCk, int nbEdges) {
@@ -1266 +1388 @@
 
 
-void Order::showOuter() {
+
+void Order::showOuter(cfcStructTableType& outerComp) {
 
         // For all 3D component embedded in the vector outerComp
@@ -1286 +1409 @@
 
 
-void Order::showInner(int noFixed1, int noFixed2, int freeDim) {
+void Order::showInner(int noFixed1, int noFixed2, int freeDim, cfcStructTableType& outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph) {
 
         //  For all 3D component embedded in the vector outerComp
@@ -1324 +1447 @@
 };
 
+
  
-void Order::setOuter() { 
+void Order::setOuter(cfcStructTableType& outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph) { 
 
         // ETAPE 3 DE LA PROCEDURE A DEUX DIMENSION 
@@ -1771 +1895 @@
                 if(boost::num_vertices(outerGraph) > 0) {
 
-                setMiddle(0, 1, 2, outerGraph, noComp);
-                setMiddle(1, 0, 2, outerGraph, noComp);
-                setMiddle(2, 0, 1, outerGraph, noComp);
+                setMiddle(0, 1, 2, outerGraph, noComp, middleComp, innerComp);
+                setMiddle(1, 0, 2, outerGraph, noComp, middleComp, innerComp);
+                setMiddle(2, 0, 1, outerGraph, noComp, middleComp, innerComp);
 
                 }
@@ -1851 +1975 @@
 
 
-void Order::showMiddle(int noFixed1) { 
+void Order::showMiddle(int noFixed1, cfcStructTableType& outerComp, middleCompType& middleComp, myGraphType& myGraph) { 
 
                 cout << endl << "showMiddle(" << noFixed1 << ")";
@@ -2013 +2137 @@
 
 
-void Order::showGraph( myGraphType& currentGraph) {
+void Order::showGraph( myGraphType& currentGraph, myGraphType& myGraph) {
 
         cout << endl << "showGraph : " <<  endl << endl;
@@ -2098 +2222 @@
                      
  
-void Order::readParam(Order& myOrder, int noAxis, int valAxis, int noParam) {
+void Order::readParam(int noAxis, int valAxis, int noParam) {
 
         ofstream hiddenFile; 
@@ -2150 +2274 @@
                                 if(noParam == 1) hiddenFile << endl << endl << "forder"; 
 
-                                // OBJ this -> orderTokens.push_back("forder");
+                                this -> orderTokens.push_back("forder");
 
                         break;
@@ -2170 +2294 @@
                                 if(noParam == 1) hiddenFile << endl << endl << "\tforder" << endl << "forder"; 
 
-                                // OBJ this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder");
-
-                                myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder");                       
+                                this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder");
+
+                                // myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder");                    
 
                         break;
@@ -2186 +2310 @@
                                 hiddenFile << endl << endl << "\t\tforder" << endl << endl << "\tforder" << endl << "forder";
 
-                                // OBJ this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder");
-
-                                myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder");  myOrder.orderTokens.push_back("forder");
+                                this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder");
+
+                                // myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder");  myOrder.orderTokens.push_back("forder");
 
                         break;
@@ -2221 +2345 @@
         stringstream valParam;  
         
-        // OBJ this -> orderTokens.push_back("order");
+        this -> orderTokens.push_back("order");
 
         switch(valAxis) {
@@ -2253 +2377 @@
                         valParam << noAxis + 1; 
 
-                        // OBJ this -> orderTokens.push_back(valParam.str());
-
-                        myOrder.orderTokens.push_back("order");
-                        myOrder.orderTokens.push_back(valParam.str()); 
+                        this -> orderTokens.push_back(valParam.str());
+
+                        // myOrder.orderTokens.push_back("order");
+                        // myOrder.orderTokens.push_back(valParam.str()); 
 }
 
@@ -2269 +2393 @@
         if(lastParam == 3) {    hiddenFile  << endl << endl << "\t\tforder" << endl << endl << "\tforder" << endl << "forder" << endl << endl; 
 
-                                // OBJ this -> orderTokens.push_back("forder");  this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); }                     
+                                this -> orderTokens.push_back("forder");  this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); }                    
                 
-                                myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); }
+                                // myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); }
 
         // If the last parameter was the second in the order statement, then two parameters have to be closed (one for each open parameter)
@@ -2278 +2402 @@
         if(lastParam == 2) {    hiddenFile << endl << endl << "\tforder" << endl << "forder" << endl << endl;
         
-                                // OBJ this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); }
-        
-                                myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); }
+                                this -> orderTokens.push_back("forder"); this -> orderTokens.push_back("forder"); }
+        
+                                // myOrder.orderTokens.push_back("forder"); myOrder.orderTokens.push_back("forder"); }
 
         // If the last parameter was the first in the order statement, then one parameter have to be closed 
         // ------------------------------------------------------------------------------------------------
 
-        if(lastParam == 1) { hiddenFile << endl << endl << "forder" << endl << endl; /* OBJ this -> orderTokens.push_back("forder"); } // OBJ */ myOrder.orderTokens.push_back("forder"); }
+        if(lastParam == 1) { hiddenFile << endl << endl << "forder" << endl << endl; this -> orderTokens.push_back("forder"); } /* OBJ myOrder.orderTokens.push_back("forder"); } */
 
 
@@ -2299 +2423 @@
 
 
-void Order::setInner(int noComp3D, int noFixed1, int noComp2D, int noFixed2, int freeDim, myGraphType& upperGraph) {
+void Order::setInner(int noComp3D, int noFixed1, int noComp2D, int noFixed2, int freeDim, myGraphType& upperGraph, innerCompType& innerComp) {
 
         myGraphType currentGraph;
@@ -2546 +2670 @@
 
 
-void Order::setMiddle(int fixedDim, int dimOne, int dimTwo, myGraphType& currentGraph, int noComp) {
+void Order::setMiddle(int fixedDim, int dimOne, int dimTwo, myGraphType& currentGraph, int noComp, middleCompType& middleComp, innerCompType& innerComp) {
 
 
@@ -2778 +2902 @@
                         case 0:
 
-                                setInner(noComp, fixedDim, noComp2D, 1, 2, outputGraph);    // jk    
-        
-                                setInner(noComp, fixedDim, noComp2D, 2, 1, outputGraph);    // kj
+                                setInner(noComp, fixedDim, noComp2D, 1, 2, outputGraph, innerComp);    // jk    
+        
+                                setInner(noComp, fixedDim, noComp2D, 2, 1, outputGraph, innerComp);    // kj
 
                         break;
@@ -2786 +2910 @@
                         case 1:
 
-                                setInner(noComp, fixedDim, noComp2D, 0, 2, outputGraph);    // ik
-
-                                setInner(noComp, fixedDim, noComp2D, 2, 0, outputGraph);    // ki
+                                setInner(noComp, fixedDim, noComp2D, 0, 2, outputGraph, innerComp);    // ik
+
+                                setInner(noComp, fixedDim, noComp2D, 2, 0, outputGraph, innerComp);    // ki
 
                         break;
@@ -2794 +2918 @@
                         case 2:
 
-                                setInner(noComp, fixedDim, noComp2D, 0, 1, outputGraph);    // ij
-
-                                setInner(noComp, fixedDim, noComp2D, 1, 0, outputGraph);    // ji
+                                setInner(noComp, fixedDim, noComp2D, 0, 1, outputGraph, innerComp);    // ij
+
+                                setInner(noComp, fixedDim, noComp2D, 1, 0, outputGraph, innerComp);    // ji
 
                         break;
@@ -2805 +2929 @@
 
 
-void Order::read1D(Order& myOrder) {
+void Order::read1D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph) {
 
         ofstream hiddenFile;
@@ -2832 +2956 @@
                                 // ------------------------------------------------------------------------------------------------------------------------
 
-                                readParam(myOrder, 0, valAxis1, 1);
+                                readParam(0, valAxis1, 1);
 
                                 hiddenFile.open(theProject.c_str(), ios::app);
@@ -2848 +2972 @@
                                         hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][1][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                        // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][1][noComp1D].embeddedModuls[noMod]));
-
-                                        myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][1][noComp1D].embeddedModuls[noMod]));
+                                        this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][1][noComp1D].embeddedModuls[noMod]));
+
+                                        // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][1][noComp1D].embeddedModuls[noMod]));
 
                                 }
@@ -2862 +2986 @@
         // -------------------------
 
-        readParam(myOrder, 0, 0, 0);
+        readParam(0, 0, 0);
 
 };
@@ -2868 +2992 @@
 
 
-void Order::read2D(Order& myOrder) {
+void Order::read2D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph) {
 
         ofstream hiddenFile;
@@ -2895 +3019 @@
                         // --------------------------------------------------------------------------------------------------------------------------------
 
-                        readParam(myOrder, noFixed1 -1, valFixed1, 1);
+                        readParam(noFixed1 -1, valFixed1, 1);
                 
                         hiddenFile.open(theProject.c_str(), ios::app);
@@ -2921 +3045 @@
                                 // ----------------------------------------------------------------------------------------------------------------------------
 
-                                readParam(myOrder, noAxis2 -1, valAxis2, 2);
+                                readParam(noAxis2 -1, valAxis2, 2);
         
                                 hiddenFile.open(theProject.c_str(), ios::app);
@@ -2942 +3066 @@
                                                 hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
                                         
-                                                // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));   
+                                                this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));  
                                                 
-                                                myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod])); 
+                                                // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod])); 
         
                                         }
@@ -2976 +3100 @@
                                         // ----------------------------------------------------------------------------------------------------------------------------
                                
-                                        readParam(myOrder, noAxis3 -1, valAxis3, 2);
+                                        readParam(noAxis3 -1, valAxis3, 2);
 
                                         hiddenFile.open(theProject.c_str(), ios::app);
@@ -2992 +3116 @@
                                                 hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                                // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
                                                 
-                                                myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][0][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
         
                                         }
@@ -3007 +3131 @@
         // -------------------------
 
-        readParam(myOrder, 0, 0, 0);
+        readParam(0, 0, 0);
 };
 
@@ -3014 +3138 @@
 
 
-void Order::read3D(Order& myOrder) {
+void Order::read3D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph) {
 
         ofstream hiddenFile;
@@ -3041 +3165 @@
         // ---------------------------------------------------------------------------------------------------------------------------------------
 
-        readParam(myOrder, noFixed1, valFixed1, 1);
+        readParam(noFixed1, valFixed1, 1);
 
         // If the second axis value is defined in the 3D graph 
@@ -3051 +3175 @@
                 // ------------------------------------------------------------------------------------------------------------
 
-                 readParam(myOrder, noAxis2, valAxis2, 2);
+                 readParam(noAxis2, valAxis2, 2);
 
                 // If the third axis value is defined in the 3D graph
@@ -3061 +3185 @@
                                 // -----------------------------------------------------------------------------------------------------------
 
-                                readParam(myOrder, noAxis3, valAxis3, 3);
+                                readParam(noAxis3, valAxis3, 3);
 
                                 hiddenFile.open(theProject.c_str(), ios::app);
@@ -3092 +3216 @@
                                                         hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                        // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                        this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
                                         
-                                         myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                         // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
 
                                                 }
@@ -3136 +3260 @@
                                         // -----------------------------------------------------------
 
-                                        readParam(myOrder, noAxis3, valAxis3, 3);
+                                        readParam(noAxis3, valAxis3, 3);
         
                                         hiddenFile.open(theProject.c_str(), ios::app);
@@ -3152 +3276 @@
                                                 hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                                // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));    
-
-                                                myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));   
+
+                                                // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
 
                                         }
@@ -3204 +3328 @@
                                 // ------------------------------------------------------------
 
-                                readParam(myOrder, noAxis2, valAxis2, 2);
+                                readParam(noAxis2, valAxis2, 2);
 
                                 // If the third axis value is defined in the 2D graph
@@ -3214 +3338 @@
                                         // -----------------------------------------------------------
 
-                                        readParam(myOrder, noAxis3, valAxis3, 3);
+                                        readParam(noAxis3, valAxis3, 3);
 
                                         hiddenFile.open(theProject.c_str(), ios::app);
@@ -3235 +3359 @@
                                                         hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                                // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
          
-                                                myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
 
                                                 }
@@ -3268 +3392 @@
                                                 // -----------------------------------------------------------
 
-                                                readParam(myOrder, noAxis3, valAxis3, 3);
+                                                readParam(noAxis3, valAxis3, 3);
 
                                                 hiddenFile.open(theProject.c_str(), ios::app);  
@@ -3284 +3408 @@
                                                         hiddenFile << boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]) << " ";
 
-                                                // OBJ this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
-
-                                                myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+                                                this -> orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
+
+                                                // myOrder.orderTokens.push_back(boost::get(boost::vertex_name_t(), myGraph, innerComp[noComp3D][noFixed1][noComp2D][noAxis2][noComp1D].embeddedModuls[noMod]));
 
                                                 }
@@ -3302 +3426 @@
         // -------------------------
 
-        readParam(myOrder, 0, 0, 0);
+        readParam(0, 0, 0);
 };
 

trunk/yao/src/YAOObjects/Order.hpp

@@ -113 +113 @@
     Order(Table<Modul> * aTheModulTable){ theModulTable = aTheModulTable; }
 
+        Order(){ }
+
     
 /*    //! Constructor for the order coherences check
@@ -179 +181 @@
      
 // ------------------  AJOUT CB VERIFICATION DES BOUCLES ------------------ //
+
   public : 
-  static void checkOrder(Table<Connection> * theConnectionTable, Table<Modul> * theModulTable, Table<Space> * theSpaceTable, 
-        Table<Operator> * theOperatorTable, Table<Order> * theOrderTable);
+
+  void checkOrder(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>& theSpaceTable, Table<Operator>& theOperatorTable, Table<Order>& theOrderTable);
+
   private : 
-  int getDimSize(string space, int dim);
-  bool checkConnection(int numDim, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget, int valCijk[3], bool absCijk[3], int lastAxis);
-  bool checkModOrder(Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget);
-  Table<Modul>::iterator getModule(string nom, Table<Modul>& myModulTable);    // Return an iterator on the module named "nom".
-  static  void setLoop(Table<Connection> * theConnectionTable, Table<Modul> * theModulTable, Table<Space> * theSpaceTable, 
-        Table<Operator> * theOperatorTable, Table<Order> * theOrderTable);               // Set up all the loops by scanning the order directives.
-  void checkConnections();                         // Check all connections defined in the ctin directives.
-  void showModInfos();
-  void setGraph();
+
+  int getDimSize(string space, int dim, Table<Space>&  theSpaceTable);
+
+  bool checkConnection(string projectName, int numDim, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget, int valCijk[3], bool absCijk[3], int lastAxis, Table<Space>&  theSpaceTable); 
+
+  bool checkModOrder(string projectName, Table<Modul>::iterator itSource, Table<Modul>::iterator itTarget);
+
+  Table<Modul>::iterator getModule(string nom, Table<Modul>& theModulTable);    // Return an iterator on the module named "nom".
+
+  // Set up all the loops by scanning the order directives.
+
+  void setLoop(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>& theSpaceTable, Table<Operator>& theOperatorTable, Table<Order>& theOrderTable);
+
+  // Check all connections defined in the ctin directives.
+
+  void checkConnections(string projectName, Table<Connection>& theConnectionTable, Table<Modul>& theModulTable, Table<Space>&  theSpaceTable);
 
 
@@ -200 +211 @@
 
 
-   vector<string> myOrderTokens;
+   // vector<string> myOrderTokens;
 
    // dedicated light structures that register, from the yaoo objects,  all the informations needed to perform the order generation
@@ -219 +230 @@
    typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, verticesProperties, edgesPorperties> myGraphType;
 
-   // Definition of tha main graph that will be used all along the program
-   myGraphType myGraph; 
-
    // Attribute type of the cfc structures that embed the axis number as first element and the axis value as second element.
    typedef pair<int, int> valAxisType;
@@ -230 +238 @@
    // Definition of the data type that record all the component invormations of a graph (vector of cfcStruct).
    typedef vector<cfcStruct> cfcStructTableType;
+
+   typedef cfcStructTableType** middleCompType; 
+
+   typedef cfcStructTableType**** innerCompType;
         
-   // Vector of component structures that embed informations on the 3D main graph
-   vector<cfcStruct> outerComp;
-
-   // Array of vectors of component structures that embed informations on the 2D graphs
-   cfcStructTableType **middleComp;
-
-   // Array of vectors of component structures that embed informations on the 1D graphs
-   cfcStructTableType ****innerComp; 
-
-   // Graph iterators and descriptors that are used all along the program (declared here to avoid several decalarations inside the source code).
+   // Graph iterators and descriptors that are used all along the program (declared here to avoid several decalarations inside the source code). 
 
    typedef boost::graph_traits<myGraphType>::edge_descriptor edgeDescriptor;
@@ -251 +254 @@
 
    // A string that contain the project name given as a paramater to automaticOrderGenerator (declared here to avoid changing all the function calls)
+
    string theProject;
    
@@ -261 +265 @@
          */
          void automaticOrderGenerator(string projectName, Table<Order>& theOrderTable, Table<Modul>& myModulTable, Table<Connection>& myConnectionTable, Table<Space>& mySpaceTable);
-         // void automaticOrderGenerator(string projectName, Table<Order>& theOrderTable);
 
     private:
@@ -280 +283 @@
         *       - for each component, launch the function that will manage the two dimensionals components with the 3D component graph as a parameter
         */
-        void setOuter();
+        void setOuter(cfcStructTableType& outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph);
 
         /**
@@ -301 +304 @@
         * @param currentGraph the 3D component graph from which the 2D component vector will be extracted
         */
-        void setMiddle(int fixedDim, int dimOne, int dimTwo, myGraphType& currentGraph, int noComp);
+        void setMiddle(int fixedDim, int dimOne, int dimTwo, myGraphType& currentGraph, int noComp, middleCompType& middleComp, innerCompType& innerComp);
 
         /**     
@@ -322 +325 @@
         * @param upperGraph the 2D component graph from which the 1D component vector will be extracted
         */
-        void setInner(int noComp3D, int noFixed1, int noComp2D, int noFixed2, int freeDim, myGraphType& upperGraph);
+        void setInner(int noComp3D, int noFixed1, int noComp2D, int noFixed2, int freeDim, myGraphType& upperGraph, innerCompType& innerComp);
 
         // --  Functions for managing the graphs --
@@ -477 +480 @@
         * @param noParam the parameter number on which the order have to be displayed (is the parameter is the first, second or third)           
         */
-        void readParam(Order& myOrder, int noAxis, int valAxis, int noParam);
+        void readParam(int noAxis, int valAxis, int noParam);
 
         /**
@@ -486 +489 @@
         * for the axis number that have an offset because axis "k" is in reality "i" (cf. to3D() function). 
         */
-        void read1D(Order& myOrder);
+        void read1D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph);
 
         /**
@@ -494 +497 @@
         * for the axis number that have an offset because "j" and "k" axis are in reality "i" and "j" axis (cf. to3D() function). 
         */
-        void read2D(Order& myOrder);
+        void read2D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph);
 
         /** 
@@ -506 +509 @@
         * read them and the moduls from the 1D component vector (innerComp).
         */
-        void read3D(Order& myOrder);
+        void read3D(cfcStructTableType outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph);
 
         // -- Functions that display data structures -- 
@@ -514 +517 @@
         * @param currentGraph a reference to the graph on which informations have to be shown
         */
-        void showGraph(myGraphType& currentGraph);
+        void showGraph(myGraphType& currentGraph, myGraphType& myGraph);
 
         /**
@@ -520 +523 @@
         * Informations displayed are the "cfcSign" attributes (axis number and axis direction)
         */
-        void showOuter();
+        void showOuter(cfcStructTableType& outerComp);
 
         /**
@@ -529 +532 @@
         * @param noFixed1 an integer value indicating from which fixed dimension the vector must be shown
         */
-        void showMiddle(int noFixed1);
+        void showMiddle(int noFixed1, cfcStructTableType& outerComp, middleCompType& middleComp, myGraphType& myGraph);
 
         /**
@@ -540 +543 @@
         * @param freeDim an integer value indicating the last dimension (not necessary because it does not index the array at all)
         */
-        void showInner(int noFixed1, int noFixed2, int freeDim);
+        void showInner(int noFixed1, int noFixed2, int freeDim, cfcStructTableType& outerComp, middleCompType& middleComp, innerCompType& innerComp, myGraphType& myGraph);
 
         // -- Tool functions --