TextArrayFormatをtextarrayformatに変更した。

diff --git a/.gitignore b/.gitignore
index 8b09f34..1a59e83 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ utakata
 /test/lexer_test
 /test/sublexer_test
 /test/lexer_test_flymake.cpp
+/test/parser_test

diff --git a/Makefile b/Makefile
index 2e39536..f201273 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_utakata_OBJECTS = main.$(OBJEXT) vm.$(OBJEXT) operand.$(OBJEXT) \
-       cpu.$(OBJEXT) utf8.$(OBJEXT) TextArrayFormat.$(OBJEXT) \
+       cpu.$(OBJEXT) utf8.$(OBJEXT) textarrayformat.$(OBJEXT) \
        utf8_string.$(OBJEXT)
 utakata_OBJECTS = $(am_utakata_OBJECTS)
 utakata_LDADD = $(LDADD)
@@ -179,7 +179,7 @@ AM_CPPFLAGS = -Wall
 SUBDIRS = . test
 INCLUDES = -l$(top_srcdir)
 utakata_SOURCES = main.cpp vm.cpp operand.cpp cpu.cpp utf8.cpp \
-       TextArrayFormat.cpp utf8_string.cpp
+       textarrayformat.cpp utf8_string.cpp
 
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -269,10 +269,10 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-include ./$(DEPDIR)/TextArrayFormat.Po
 include ./$(DEPDIR)/cpu.Po
 include ./$(DEPDIR)/main.Po
 include ./$(DEPDIR)/operand.Po
+include ./$(DEPDIR)/textarrayformat.Po
 include ./$(DEPDIR)/utf8.Po
 include ./$(DEPDIR)/utf8_string.Po
 include ./$(DEPDIR)/vm.Po

diff --git a/Makefile.am b/Makefile.am
index ec5b31b..ae48a41 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,4 +5,4 @@ INCLUDES = -l$(top_srcdir)
 bin_PROGRAMS = utakata
 
 utakata_SOURCES = main.cpp vm.cpp operand.cpp cpu.cpp utf8.cpp \
-       TextArrayFormat.cpp utf8_string.cpp
+       textarrayformat.cpp utf8_string.cpp

diff --git a/Makefile.in b/Makefile.in
index a811fc2..dc6a05e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_utakata_OBJECTS = main.$(OBJEXT) vm.$(OBJEXT) operand.$(OBJEXT) \
-       cpu.$(OBJEXT) utf8.$(OBJEXT) TextArrayFormat.$(OBJEXT) \
+       cpu.$(OBJEXT) utf8.$(OBJEXT) textarrayformat.$(OBJEXT) \
        utf8_string.$(OBJEXT)
 utakata_OBJECTS = $(am_utakata_OBJECTS)
 utakata_LDADD = $(LDADD)
@@ -179,7 +179,7 @@ AM_CPPFLAGS = -Wall
 SUBDIRS = . test
 INCLUDES = -l$(top_srcdir)
 utakata_SOURCES = main.cpp vm.cpp operand.cpp cpu.cpp utf8.cpp \
-       TextArrayFormat.cpp utf8_string.cpp
+       textarrayformat.cpp utf8_string.cpp
 
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -269,10 +269,10 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextArrayFormat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/operand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textarrayformat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8_string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vm.Po@am__quote@

diff --git a/config.log b/config.log
index a086a7d..9c01dff 100644 (file)
--- a/config.log
+++ b/config.log
@@ -650,3 +650,75 @@ on localhost
 
 config.status:776: creating Makefile
 config.status:1050: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by utakata config.status 0.0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status test/Makefile depfiles
+
+on localhost
+
+config.status:776: creating test/Makefile
+config.status:1050: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by utakata config.status 0.0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status test/Makefile depfiles
+
+on localhost
+
+config.status:776: creating test/Makefile
+config.status:1050: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by utakata config.status 0.0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status test/Makefile depfiles
+
+on localhost
+
+config.status:776: creating test/Makefile
+config.status:1050: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by utakata config.status 0.0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status Makefile depfiles
+
+on localhost
+
+config.status:776: creating Makefile
+config.status:1050: executing depfiles commands

diff --git a/number.h b/number.h
index 6119f77..55a9809 100755 (executable)
--- a/number.h
+++ b/number.h
@@ -1,72 +1,71 @@
 #ifndef _NUMBER_H_
 #define _NUMBER_H_
 
-namespace vm {
+namespace utakata {
 
-    class Number
-    {
-        /**
-           Schemeの数階層の最上位となるクラス。
-           このクラスは実際にはインスタンス化されず、
-           型として存在しているだけになる。
-        */
-    public:
-        CNumber(){}
-        virtual ~CNumber(){}
+    namespace primitive {
 
-        
-    };
+        class Number
+        {
+            /**
+               Schemeの数階層の最上位となるクラス。
+               このクラスは実際にはインスタンス化されず、
+               型として存在しているだけになる。
+            */
+        public:
+            Number(){}
+            virtual ~Number(){}
+        };
 
-    class Complex : public CNumber
-    {
-        /**
-           複素数を扱うクラス。
-           複素数は、有理数を含む全ての実数を表現することが可能であるため、
-           CNumberの直下として働く。
-        */
-    public:
-        CComplex(){}
-        virtual ~CComplex(){}
-    };
+        class Complex : public Number
+        {
+            /**
+               複素数を扱うクラス。
+               複素数は、有理数を含む全ての実数を表現することが可能であるため、
+               Numberの直下として働く。
+            */
+        public:
+            Complex(){}
+            virtual ~Complex(){}
+        };
 
-    class Real : public CComplex
-    {
-        /**
-           schemeの実数を表現するクラス。
-           有理数と整数、および無理数を表現できる。
-        */
-    public:
-        CReal() {}
-        virtual ~CReal() {}
-    };
+        class Real : public Complex
+        {
+            /**
+               schemeの実数を表現するクラス。
+               有理数と整数、および無理数を表現できる。
+            */
+        public:
+            Real() {}
+            virtual ~Real() {}
+        };
 
-    class Rational : public CReal
-    {
-        /**
-           schemeの有理数を表現するクラス。
-           有理数と整数を表現することができる。
-           有理数とは、整数aとbの除算で表現できる小数となる。
-           整数同士の除算で表現できない場合、その数は無理数となり、実数となる。
-        */
-    public:
-        CRational() {}
-        virtual ~CRational() {}
-    };
+        class Rational : public Real
+        {
+            /**
+               schemeの有理数を表現するクラス。
+               有理数と整数を表現することができる。
+               有理数とは、整数aとbの除算で表現できる小数となる。
+               整数同士の除算で表現できない場合、その数は無理数となり、実数となる。
+            */
+        public:
+            Rational() {}
+            virtual ~Rational() {}
+        };
 
-    class Integer : public CRational
-    {
-        /**
-           schemeの整数を表現するクラス。
-           整数はその通りであり、概要でいえば、小数点が存在しない数になる。
-           正確な整数は、原則としてメモリのみに桁数が依存される。
-        */
-    public:
-        CInteger() {}
-        virtual ~CInteger() {}
+        class Integer : public Rational
+        {
+            /**
+               schemeの整数を表現するクラス。
+               整数はその通りであり、概要でいえば、小数点が存在しない数になる。
+               正確な整数は、原則としてメモリのみに桁数が依存される。
+            */
+        public:
+            Integer() {}
+            virtual ~Integer() {}
+        };
 
-        
     };
-
 };
 
 #endif /* _NUMBER_H_ */

diff --git a/parser.cpp b/parser.cpp
index 9a59589..8c7fdaf 100644 (file)
--- a/parser.cpp
+++ b/parser.cpp
@@ -2,6 +2,11 @@
 
 using namespace utakata;
 
-parser::Parser(const smart_ptr<lexer::Lexer>& l) : lexer_(l)
+parser::Parser::Parser(const smart_ptr<lexer::Lexer>& l) : lexer_(l)
 {
 }
+
+bool parser::Parser::parse(smart_ptr<utf8::UTF8InputStream>& strm)
+{
+    return true;
+}

diff --git a/parser.h b/parser.h
index d4c2841..71375ee 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -3,6 +3,7 @@
 
 #include "lexer.h"
 #include "smart_ptr.h"
+#include "utf8.h"
 
 namespace utakata {
 
@@ -20,7 +21,7 @@ namespace utakata {
             // 受け取ったlexerからの字句の取得を行い、解析を行なう。
             // 成功した場合はtrueを返し、失敗した場合はfalseを返す。
             // 致命的なエラーが発生した場合には例外を返す。
-            bool parse();
+            bool parse(smart_ptr<utf8::UTF8InputStream>& strm);
 
         private:
 

diff --git a/test/Makefile b/test/Makefile
index 1f2acda..b849a0a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -32,7 +32,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = utf8_test$(EXEEXT) textarrayformat_test$(EXEEXT) \
        utf8_string_test$(EXEEXT) lexer_test$(EXEEXT) \
-       sublexer_test$(EXEEXT)
+       sublexer_test$(EXEEXT) parser_test$(EXEEXT)
 subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,11 +47,17 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_lexer_test_OBJECTS = lexer_test.$(OBJEXT) lexer.$(OBJEXT) \
        simpletest.$(OBJEXT) utf8_string.$(OBJEXT) utf8.$(OBJEXT) \
-       lexeme_id.$(OBJEXT) TextArrayFormat.$(OBJEXT) \
+       lexeme_id.$(OBJEXT) textarrayformat.$(OBJEXT) \
        sublexer_impl.$(OBJEXT) lexeme_impl.$(OBJEXT) \
        delimiter.$(OBJEXT)
 lexer_test_OBJECTS = $(am_lexer_test_OBJECTS)
 lexer_test_LDADD = $(LDADD)
+am_parser_test_OBJECTS = parser_test.$(OBJEXT) sublexer_impl.$(OBJEXT) \
+       simpletest.$(OBJEXT) utf8.$(OBJEXT) utf8_string.$(OBJEXT) \
+       lexeme_id.$(OBJEXT) lexeme_impl.$(OBJEXT) parser.$(OBJEXT) \
+       delimiter.$(OBJEXT) textarrayformat.$(OBJEXT)
+parser_test_OBJECTS = $(am_parser_test_OBJECTS)
+parser_test_LDADD = $(LDADD)
 am_sublexer_test_OBJECTS = sublexer_test.$(OBJEXT) \
        sublexer_impl.$(OBJEXT) simpletest.$(OBJEXT) \
        utf8_string.$(OBJEXT) utf8.$(OBJEXT) lexeme_id.$(OBJEXT) \
@@ -59,7 +65,7 @@ am_sublexer_test_OBJECTS = sublexer_test.$(OBJEXT) \
 sublexer_test_OBJECTS = $(am_sublexer_test_OBJECTS)
 sublexer_test_LDADD = $(LDADD)
 am_textarrayformat_test_OBJECTS = textarrayformat_test.$(OBJEXT) \
-       TextArrayFormat.$(OBJEXT) simpletest.$(OBJEXT)
+       textarrayformat.$(OBJEXT) simpletest.$(OBJEXT)
 textarrayformat_test_OBJECTS = $(am_textarrayformat_test_OBJECTS)
 textarrayformat_test_LDADD = $(LDADD)
 am_utf8_string_test_OBJECTS = utf8_string_test.$(OBJEXT) \
@@ -78,12 +84,12 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
        -o $@
-SOURCES = $(lexer_test_SOURCES) $(sublexer_test_SOURCES) \
-       $(textarrayformat_test_SOURCES) $(utf8_string_test_SOURCES) \
-       $(utf8_test_SOURCES)
-DIST_SOURCES = $(lexer_test_SOURCES) $(sublexer_test_SOURCES) \
-       $(textarrayformat_test_SOURCES) $(utf8_string_test_SOURCES) \
-       $(utf8_test_SOURCES)
+SOURCES = $(lexer_test_SOURCES) $(parser_test_SOURCES) \
+       $(sublexer_test_SOURCES) $(textarrayformat_test_SOURCES) \
+       $(utf8_string_test_SOURCES) $(utf8_test_SOURCES)
+DIST_SOURCES = $(lexer_test_SOURCES) $(parser_test_SOURCES) \
+       $(sublexer_test_SOURCES) $(textarrayformat_test_SOURCES) \
+       $(utf8_string_test_SOURCES) $(utf8_test_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -182,13 +188,16 @@ AM_CPPFLAGS = -Wall
 INCLUDES = -l$(top_srcdir)
 utf8_string_test_SOURCES = utf8_string_test.cpp ../utf8_string.cpp ../simpletest.cpp ../utf8.cpp
 utf8_test_SOURCES = utf8_test.cpp ../utf8.cpp ../simpletest.cpp
-textarrayformat_test_SOURCES = textarrayformat_test.cpp ../TextArrayFormat.cpp ../simpletest.cpp
+textarrayformat_test_SOURCES = textarrayformat_test.cpp ../textarrayformat.cpp ../simpletest.cpp
 lexer_test_SOURCES = lexer_test.cpp ../lexer.cpp  ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
-../lexeme_id.cpp ../TextArrayFormat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
+../lexeme_id.cpp ../textarrayformat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
 
 sublexer_test_SOURCES = sublexer_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
 ../lexeme_id.cpp ../lexeme_impl.cpp ../delimiter.cpp
 
+parser_test_SOURCES = parser_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8.cpp ../utf8_string.cpp \
+../lexeme_id.cpp ../lexeme_impl.cpp ../parser.cpp ../delimiter.cpp ../textarrayformat.cpp
+
 check_PROGRANS = $(bin_PROGRAMS)
 TESTS = $(bin_PROGRAMS)
 all: all-am
@@ -250,6 +259,9 @@ clean-binPROGRAMS:
 lexer_test$(EXEEXT): $(lexer_test_OBJECTS) $(lexer_test_DEPENDENCIES) 
        @rm -f lexer_test$(EXEEXT)
        $(CXXLINK) $(lexer_test_OBJECTS) $(lexer_test_LDADD) $(LIBS)
+parser_test$(EXEEXT): $(parser_test_OBJECTS) $(parser_test_DEPENDENCIES) 
+       @rm -f parser_test$(EXEEXT)
+       $(CXXLINK) $(parser_test_OBJECTS) $(parser_test_LDADD) $(LIBS)
 sublexer_test$(EXEEXT): $(sublexer_test_OBJECTS) $(sublexer_test_DEPENDENCIES) 
        @rm -f sublexer_test$(EXEEXT)
        $(CXXLINK) $(sublexer_test_OBJECTS) $(sublexer_test_LDADD) $(LIBS)
@@ -269,15 +281,17 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-include ./$(DEPDIR)/TextArrayFormat.Po
 include ./$(DEPDIR)/delimiter.Po
 include ./$(DEPDIR)/lexeme_id.Po
 include ./$(DEPDIR)/lexeme_impl.Po
 include ./$(DEPDIR)/lexer.Po
 include ./$(DEPDIR)/lexer_test.Po
+include ./$(DEPDIR)/parser.Po
+include ./$(DEPDIR)/parser_test.Po
 include ./$(DEPDIR)/simpletest.Po
 include ./$(DEPDIR)/sublexer_impl.Po
 include ./$(DEPDIR)/sublexer_test.Po
+include ./$(DEPDIR)/textarrayformat.Po
 include ./$(DEPDIR)/textarrayformat_test.Po
 include ./$(DEPDIR)/utf8.Po
 include ./$(DEPDIR)/utf8_string.Po
@@ -368,19 +382,19 @@ lexeme_id.obj: ../lexeme_id.cpp
 #      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 #      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lexeme_id.obj `if test -f '../lexeme_id.cpp'; then $(CYGPATH_W) '../lexeme_id.cpp'; else $(CYGPATH_W) '$(srcdir)/../lexeme_id.cpp'; fi`
 
-TextArrayFormat.o: ../TextArrayFormat.cpp
-       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextArrayFormat.o -MD -MP -MF $(DEPDIR)/TextArrayFormat.Tpo -c -o TextArrayFormat.o `test -f '../TextArrayFormat.cpp' || echo '$(srcdir)/'`../TextArrayFormat.cpp
-       mv -f $(DEPDIR)/TextArrayFormat.Tpo $(DEPDIR)/TextArrayFormat.Po
-#      source='../TextArrayFormat.cpp' object='TextArrayFormat.o' libtool=no \
+textarrayformat.o: ../textarrayformat.cpp
+       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textarrayformat.o -MD -MP -MF $(DEPDIR)/textarrayformat.Tpo -c -o textarrayformat.o `test -f '../textarrayformat.cpp' || echo '$(srcdir)/'`../textarrayformat.cpp
+       mv -f $(DEPDIR)/textarrayformat.Tpo $(DEPDIR)/textarrayformat.Po
+#      source='../textarrayformat.cpp' object='textarrayformat.o' libtool=no \
 #      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextArrayFormat.o `test -f '../TextArrayFormat.cpp' || echo '$(srcdir)/'`../TextArrayFormat.cpp
+#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textarrayformat.o `test -f '../textarrayformat.cpp' || echo '$(srcdir)/'`../textarrayformat.cpp
 
-TextArrayFormat.obj: ../TextArrayFormat.cpp
-       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextArrayFormat.obj -MD -MP -MF $(DEPDIR)/TextArrayFormat.Tpo -c -o TextArrayFormat.obj `if test -f '../TextArrayFormat.cpp'; then $(CYGPATH_W) '../TextArrayFormat.cpp'; else $(CYGPATH_W) '$(srcdir)/../TextArrayFormat.cpp'; fi`
-       mv -f $(DEPDIR)/TextArrayFormat.Tpo $(DEPDIR)/TextArrayFormat.Po
-#      source='../TextArrayFormat.cpp' object='TextArrayFormat.obj' libtool=no \
+textarrayformat.obj: ../textarrayformat.cpp
+       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textarrayformat.obj -MD -MP -MF $(DEPDIR)/textarrayformat.Tpo -c -o textarrayformat.obj `if test -f '../textarrayformat.cpp'; then $(CYGPATH_W) '../textarrayformat.cpp'; else $(CYGPATH_W) '$(srcdir)/../textarrayformat.cpp'; fi`
+       mv -f $(DEPDIR)/textarrayformat.Tpo $(DEPDIR)/textarrayformat.Po
+#      source='../textarrayformat.cpp' object='textarrayformat.obj' libtool=no \
 #      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextArrayFormat.obj `if test -f '../TextArrayFormat.cpp'; then $(CYGPATH_W) '../TextArrayFormat.cpp'; else $(CYGPATH_W) '$(srcdir)/../TextArrayFormat.cpp'; fi`
+#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textarrayformat.obj `if test -f '../textarrayformat.cpp'; then $(CYGPATH_W) '../textarrayformat.cpp'; else $(CYGPATH_W) '$(srcdir)/../textarrayformat.cpp'; fi`
 
 sublexer_impl.o: ../sublexer_impl.cpp
        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sublexer_impl.o -MD -MP -MF $(DEPDIR)/sublexer_impl.Tpo -c -o sublexer_impl.o `test -f '../sublexer_impl.cpp' || echo '$(srcdir)/'`../sublexer_impl.cpp
@@ -424,6 +438,20 @@ delimiter.obj: ../delimiter.cpp
 #      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 #      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o delimiter.obj `if test -f '../delimiter.cpp'; then $(CYGPATH_W) '../delimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/../delimiter.cpp'; fi`
 
+parser.o: ../parser.cpp
+       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.o -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.o `test -f '../parser.cpp' || echo '$(srcdir)/'`../parser.cpp
+       mv -f $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Po
+#      source='../parser.cpp' object='parser.o' libtool=no \
+#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.o `test -f '../parser.cpp' || echo '$(srcdir)/'`../parser.cpp
+
+parser.obj: ../parser.cpp
+       $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.obj -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.obj `if test -f '../parser.cpp'; then $(CYGPATH_W) '../parser.cpp'; else $(CYGPATH_W) '$(srcdir)/../parser.cpp'; fi`
+       mv -f $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Po
+#      source='../parser.cpp' object='parser.obj' libtool=no \
+#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.obj `if test -f '../parser.cpp'; then $(CYGPATH_W) '../parser.cpp'; else $(CYGPATH_W) '$(srcdir)/../parser.cpp'; fi`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \

diff --git a/test/Makefile.am b/test/Makefile.am
index d6b7ee4..25dbec2 100755 (executable)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,15 +2,17 @@
 AM_CPPFLAGS = -Wall
 INCLUDES = -l$(top_srcdir)
 
-bin_PROGRAMS = utf8_test textarrayformat_test utf8_string_test lexer_test sublexer_test
+bin_PROGRAMS = utf8_test textarrayformat_test utf8_string_test lexer_test sublexer_test parser_test
 
 utf8_string_test_SOURCES = utf8_string_test.cpp ../utf8_string.cpp ../simpletest.cpp ../utf8.cpp
 utf8_test_SOURCES = utf8_test.cpp ../utf8.cpp ../simpletest.cpp
-textarrayformat_test_SOURCES = textarrayformat_test.cpp ../TextArrayFormat.cpp ../simpletest.cpp
+textarrayformat_test_SOURCES = textarrayformat_test.cpp ../textarrayformat.cpp ../simpletest.cpp
 lexer_test_SOURCES = lexer_test.cpp ../lexer.cpp  ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
-../lexeme_id.cpp ../TextArrayFormat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
+../lexeme_id.cpp ../textarrayformat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
 sublexer_test_SOURCES = sublexer_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
 ../lexeme_id.cpp ../lexeme_impl.cpp ../delimiter.cpp
+parser_test_SOURCES = parser_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8.cpp ../utf8_string.cpp \
+../lexeme_id.cpp ../lexeme_impl.cpp ../parser.cpp ../delimiter.cpp ../textarrayformat.cpp
 
 check_PROGRANS = $(bin_PROGRAMS)
 TESTS = $(bin_PROGRAMS)

diff --git a/test/Makefile.in b/test/Makefile.in
index 8eb452e..964517a 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -32,7 +32,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = utf8_test$(EXEEXT) textarrayformat_test$(EXEEXT) \
        utf8_string_test$(EXEEXT) lexer_test$(EXEEXT) \
-       sublexer_test$(EXEEXT)
+       sublexer_test$(EXEEXT) parser_test$(EXEEXT)
 subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,11 +47,17 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_lexer_test_OBJECTS = lexer_test.$(OBJEXT) lexer.$(OBJEXT) \
        simpletest.$(OBJEXT) utf8_string.$(OBJEXT) utf8.$(OBJEXT) \
-       lexeme_id.$(OBJEXT) TextArrayFormat.$(OBJEXT) \
+       lexeme_id.$(OBJEXT) textarrayformat.$(OBJEXT) \
        sublexer_impl.$(OBJEXT) lexeme_impl.$(OBJEXT) \
        delimiter.$(OBJEXT)
 lexer_test_OBJECTS = $(am_lexer_test_OBJECTS)
 lexer_test_LDADD = $(LDADD)
+am_parser_test_OBJECTS = parser_test.$(OBJEXT) sublexer_impl.$(OBJEXT) \
+       simpletest.$(OBJEXT) utf8.$(OBJEXT) utf8_string.$(OBJEXT) \
+       lexeme_id.$(OBJEXT) lexeme_impl.$(OBJEXT) parser.$(OBJEXT) \
+       delimiter.$(OBJEXT) textarrayformat.$(OBJEXT)
+parser_test_OBJECTS = $(am_parser_test_OBJECTS)
+parser_test_LDADD = $(LDADD)
 am_sublexer_test_OBJECTS = sublexer_test.$(OBJEXT) \
        sublexer_impl.$(OBJEXT) simpletest.$(OBJEXT) \
        utf8_string.$(OBJEXT) utf8.$(OBJEXT) lexeme_id.$(OBJEXT) \
@@ -59,7 +65,7 @@ am_sublexer_test_OBJECTS = sublexer_test.$(OBJEXT) \
 sublexer_test_OBJECTS = $(am_sublexer_test_OBJECTS)
 sublexer_test_LDADD = $(LDADD)
 am_textarrayformat_test_OBJECTS = textarrayformat_test.$(OBJEXT) \
-       TextArrayFormat.$(OBJEXT) simpletest.$(OBJEXT)
+       textarrayformat.$(OBJEXT) simpletest.$(OBJEXT)
 textarrayformat_test_OBJECTS = $(am_textarrayformat_test_OBJECTS)
 textarrayformat_test_LDADD = $(LDADD)
 am_utf8_string_test_OBJECTS = utf8_string_test.$(OBJEXT) \
@@ -78,12 +84,12 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
        -o $@
-SOURCES = $(lexer_test_SOURCES) $(sublexer_test_SOURCES) \
-       $(textarrayformat_test_SOURCES) $(utf8_string_test_SOURCES) \
-       $(utf8_test_SOURCES)
-DIST_SOURCES = $(lexer_test_SOURCES) $(sublexer_test_SOURCES) \
-       $(textarrayformat_test_SOURCES) $(utf8_string_test_SOURCES) \
-       $(utf8_test_SOURCES)
+SOURCES = $(lexer_test_SOURCES) $(parser_test_SOURCES) \
+       $(sublexer_test_SOURCES) $(textarrayformat_test_SOURCES) \
+       $(utf8_string_test_SOURCES) $(utf8_test_SOURCES)
+DIST_SOURCES = $(lexer_test_SOURCES) $(parser_test_SOURCES) \
+       $(sublexer_test_SOURCES) $(textarrayformat_test_SOURCES) \
+       $(utf8_string_test_SOURCES) $(utf8_test_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -182,13 +188,16 @@ AM_CPPFLAGS = -Wall
 INCLUDES = -l$(top_srcdir)
 utf8_string_test_SOURCES = utf8_string_test.cpp ../utf8_string.cpp ../simpletest.cpp ../utf8.cpp
 utf8_test_SOURCES = utf8_test.cpp ../utf8.cpp ../simpletest.cpp
-textarrayformat_test_SOURCES = textarrayformat_test.cpp ../TextArrayFormat.cpp ../simpletest.cpp
+textarrayformat_test_SOURCES = textarrayformat_test.cpp ../textarrayformat.cpp ../simpletest.cpp
 lexer_test_SOURCES = lexer_test.cpp ../lexer.cpp  ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
-../lexeme_id.cpp ../TextArrayFormat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
+../lexeme_id.cpp ../textarrayformat.cpp ../sublexer_impl.cpp ../lexeme_impl.cpp ../delimiter.cpp
 
 sublexer_test_SOURCES = sublexer_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8_string.cpp ../utf8.cpp \
 ../lexeme_id.cpp ../lexeme_impl.cpp ../delimiter.cpp
 
+parser_test_SOURCES = parser_test.cpp ../sublexer_impl.cpp ../simpletest.cpp ../utf8.cpp ../utf8_string.cpp \
+../lexeme_id.cpp ../lexeme_impl.cpp ../parser.cpp ../delimiter.cpp ../textarrayformat.cpp
+
 check_PROGRANS = $(bin_PROGRAMS)
 TESTS = $(bin_PROGRAMS)
 all: all-am
@@ -250,6 +259,9 @@ clean-binPROGRAMS:
 lexer_test$(EXEEXT): $(lexer_test_OBJECTS) $(lexer_test_DEPENDENCIES) 
        @rm -f lexer_test$(EXEEXT)
        $(CXXLINK) $(lexer_test_OBJECTS) $(lexer_test_LDADD) $(LIBS)
+parser_test$(EXEEXT): $(parser_test_OBJECTS) $(parser_test_DEPENDENCIES) 
+       @rm -f parser_test$(EXEEXT)
+       $(CXXLINK) $(parser_test_OBJECTS) $(parser_test_LDADD) $(LIBS)
 sublexer_test$(EXEEXT): $(sublexer_test_OBJECTS) $(sublexer_test_DEPENDENCIES) 
        @rm -f sublexer_test$(EXEEXT)
        $(CXXLINK) $(sublexer_test_OBJECTS) $(sublexer_test_LDADD) $(LIBS)
@@ -269,15 +281,17 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextArrayFormat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delimiter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexeme_id.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexeme_impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexer_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpletest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sublexer_impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sublexer_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textarrayformat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textarrayformat_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8_string.Po@am__quote@
@@ -368,19 +382,19 @@ lexeme_id.obj: ../lexeme_id.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lexeme_id.obj `if test -f '../lexeme_id.cpp'; then $(CYGPATH_W) '../lexeme_id.cpp'; else $(CYGPATH_W) '$(srcdir)/../lexeme_id.cpp'; fi`
 
-TextArrayFormat.o: ../TextArrayFormat.cpp
-@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextArrayFormat.o -MD -MP -MF $(DEPDIR)/TextArrayFormat.Tpo -c -o TextArrayFormat.o `test -f '../TextArrayFormat.cpp' || echo '$(srcdir)/'`../TextArrayFormat.cpp
-@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/TextArrayFormat.Tpo $(DEPDIR)/TextArrayFormat.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../TextArrayFormat.cpp' object='TextArrayFormat.o' libtool=no @AMDEPBACKSLASH@
+textarrayformat.o: ../textarrayformat.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textarrayformat.o -MD -MP -MF $(DEPDIR)/textarrayformat.Tpo -c -o textarrayformat.o `test -f '../textarrayformat.cpp' || echo '$(srcdir)/'`../textarrayformat.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/textarrayformat.Tpo $(DEPDIR)/textarrayformat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../textarrayformat.cpp' object='textarrayformat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextArrayFormat.o `test -f '../TextArrayFormat.cpp' || echo '$(srcdir)/'`../TextArrayFormat.cpp
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textarrayformat.o `test -f '../textarrayformat.cpp' || echo '$(srcdir)/'`../textarrayformat.cpp
 
-TextArrayFormat.obj: ../TextArrayFormat.cpp
-@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextArrayFormat.obj -MD -MP -MF $(DEPDIR)/TextArrayFormat.Tpo -c -o TextArrayFormat.obj `if test -f '../TextArrayFormat.cpp'; then $(CYGPATH_W) '../TextArrayFormat.cpp'; else $(CYGPATH_W) '$(srcdir)/../TextArrayFormat.cpp'; fi`
-@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/TextArrayFormat.Tpo $(DEPDIR)/TextArrayFormat.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../TextArrayFormat.cpp' object='TextArrayFormat.obj' libtool=no @AMDEPBACKSLASH@
+textarrayformat.obj: ../textarrayformat.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textarrayformat.obj -MD -MP -MF $(DEPDIR)/textarrayformat.Tpo -c -o textarrayformat.obj `if test -f '../textarrayformat.cpp'; then $(CYGPATH_W) '../textarrayformat.cpp'; else $(CYGPATH_W) '$(srcdir)/../textarrayformat.cpp'; fi`
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/textarrayformat.Tpo $(DEPDIR)/textarrayformat.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../textarrayformat.cpp' object='textarrayformat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextArrayFormat.obj `if test -f '../TextArrayFormat.cpp'; then $(CYGPATH_W) '../TextArrayFormat.cpp'; else $(CYGPATH_W) '$(srcdir)/../TextArrayFormat.cpp'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textarrayformat.obj `if test -f '../textarrayformat.cpp'; then $(CYGPATH_W) '../textarrayformat.cpp'; else $(CYGPATH_W) '$(srcdir)/../textarrayformat.cpp'; fi`
 
 sublexer_impl.o: ../sublexer_impl.cpp
 @am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sublexer_impl.o -MD -MP -MF $(DEPDIR)/sublexer_impl.Tpo -c -o sublexer_impl.o `test -f '../sublexer_impl.cpp' || echo '$(srcdir)/'`../sublexer_impl.cpp
@@ -424,6 +438,20 @@ delimiter.obj: ../delimiter.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o delimiter.obj `if test -f '../delimiter.cpp'; then $(CYGPATH_W) '../delimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/../delimiter.cpp'; fi`
 
+parser.o: ../parser.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.o -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.o `test -f '../parser.cpp' || echo '$(srcdir)/'`../parser.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../parser.cpp' object='parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.o `test -f '../parser.cpp' || echo '$(srcdir)/'`../parser.cpp
+
+parser.obj: ../parser.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.obj -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.obj `if test -f '../parser.cpp'; then $(CYGPATH_W) '../parser.cpp'; else $(CYGPATH_W) '$(srcdir)/../parser.cpp'; fi`
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='../parser.cpp' object='parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.obj `if test -f '../parser.cpp'; then $(CYGPATH_W) '../parser.cpp'; else $(CYGPATH_W) '$(srcdir)/../parser.cpp'; fi`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \

diff --git a/test/lexer_test.cpp b/test/lexer_test.cpp
index 47d100e..5e9fc72 100755 (executable)
--- a/test/lexer_test.cpp
+++ b/test/lexer_test.cpp
@@ -5,7 +5,7 @@
 
 #include "../simpletest.h"
 
-#include "../TextArrayFormat.h"
+#include "../textarrayformat.h"
 #include "../utf8.h"
 #include "../lexer.h"
 #include "../lexeme.h"

diff --git a/test/parser_test.cpp b/test/parser_test.cpp
index cee9509..62e9602 100644 (file)
--- a/test/parser_test.cpp
+++ b/test/parser_test.cpp
@@ -5,7 +5,7 @@
 
 #include "../simpletest.h"
 
-#include "../TextArrayFormat.h"
+#include "../textarrayformat.h"
 #include "../utf8.h"
 #include "../parser.h"
 #include "../lexeme.h"
@@ -27,11 +27,10 @@ bool lexer_test(smart_ptr<simpletest::SimpleTestAsserter> asserter)
     
     std::vector<smart_ptr<lexeme::ILexeme> > lexemes;
 
-    utakata::lexer::Lexer lexer;
-    smart_ptr<lexeme::ILexeme> m(lexer.lex(st));
+    smart_ptr<utakata::lexer::Lexer> lexer(new utakata::lexer::Lexer());
 
     utakata::parser::Parser p(lexer);
-    p.parse();
+    p.parse(st);
     
     return asserter->isOk();
 }

diff --git a/test/textarrayformat_test b/test/textarrayformat_test
index 470c36d..b0a8a3c 100755 (executable)
Binary files a/test/textarrayformat_test and b/test/textarrayformat_test differ

diff --git a/test/textarrayformat_test.cpp b/test/textarrayformat_test.cpp
index b36516a..fadf09e 100644 (file)
--- a/test/textarrayformat_test.cpp
+++ b/test/textarrayformat_test.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 
 #include "../simpletest.h"
-#include "../TextArrayFormat.h"
+#include "../textarrayformat.h"
 #include "../smart_function_callback.h"
 
 using namespace std;
@@ -30,7 +30,7 @@ bool taf_test(smart_ptr<simpletest::SimpleTestAsserter> asserter)
 
 int main(int argc, char *argv[])
 {
-    simpletest::SimpleTestSuite suite("TextArrayFormat");
+    simpletest::SimpleTestSuite suite("textarrayformat");
     suite.addTester(sfcr::screate(taf_test, suite.getAsserter()));
     suite.run();
     return 0;

diff --git a/test/utf8_string_test b/test/utf8_string_test
index 08e5539..2158fdc 100755 (executable)
Binary files a/test/utf8_string_test and b/test/utf8_string_test differ

diff --git a/test/utf8_string_test.cpp b/test/utf8_string_test.cpp
index b4a41fa..8bc4843 100644 (file)
--- a/test/utf8_string_test.cpp
+++ b/test/utf8_string_test.cpp
@@ -10,7 +10,7 @@
 #include "../utf8.h"
 
 #include "../utf8_string.h"
-#include "../TextArrayFormat.h"
+#include "../textarrayformat.h"
 
 bool utf8_multichar_test(smart_ptr<simpletest::SimpleTestAsserter> asserter)
 {

diff --git a/test/utf8_test b/test/utf8_test
index 4954219..367fbb6 100755 (executable)
Binary files a/test/utf8_test and b/test/utf8_test differ

diff --git a/test/utf8_test.cpp b/test/utf8_test.cpp
index 25ef8a2..f0d6c5d 100644 (file)
--- a/test/utf8_test.cpp
+++ b/test/utf8_test.cpp
@@ -9,7 +9,7 @@
 #include "../simpletest.h"
 
 #include "../utf8.h"
-#include "../TextArrayFormat.h"
+#include "../textarrayformat.h"
 
 using namespace std;
 

diff --git a/TextArrayFormat.cpp b/textarrayformat.cpp
similarity index 98%
rename from TextArrayFormat.cpp
rename to textarrayformat.cpp
index bbaf0dc..46a73b6 100644 (file)
--- a/TextArrayFormat.cpp
+++ b/textarrayformat.cpp
@@ -7,7 +7,7 @@
 #include <assert.h>
 
 
-#include "TextArrayFormat.h"
+#include "textarrayformat.h"
 
 using namespace std;
 

diff --git a/TextArrayFormat.h b/textarrayformat.h
similarity index 100%
rename from TextArrayFormat.h
rename to textarrayformat.h