From ef11a9f9a1fa3476e6cd5ea48655e144dcc7c8ec Mon Sep 17 00:00:00 2001 From: thurston Date: Fri, 14 Nov 2008 23:58:13 +0000 Subject: [PATCH] Moved all the code into the ragel directory. git-svn-id: http://svn.complang.org/ragel/trunk@564 052ea7fc-9027-0410-9066-f65837a77df0 --- Makefile.in | 6 +- common/Makefile.in | 72 ---------------------- configure | 4 +- configure.in | 2 +- ragel/Makefile.in | 58 ++++++++++++----- {common => ragel}/buffer.h | 0 .../fflatcodegen.cpp => ragel/cd-fflatcodegen.cpp | 4 +- rlgen-cd/fflatcodegen.h => ragel/cd-fflatcodegen.h | 2 +- .../fgotocodegen.cpp => ragel/cd-fgotocodegen.cpp | 4 +- rlgen-cd/fgotocodegen.h => ragel/cd-fgotocodegen.h | 2 +- .../flatcodegen.cpp => ragel/cd-flatcodegen.cpp | 4 +- rlgen-cd/flatcodegen.h => ragel/cd-flatcodegen.h | 2 +- rlgen-cd/fsmcodegen.cpp => ragel/cd-fsmcodegen.cpp | 4 +- rlgen-cd/fsmcodegen.h => ragel/cd-fsmcodegen.h | 0 .../ftabcodegen.cpp => ragel/cd-ftabcodegen.cpp | 4 +- rlgen-cd/ftabcodegen.h => ragel/cd-ftabcodegen.h | 2 +- .../gotocodegen.cpp => ragel/cd-gotocodegen.cpp | 4 +- rlgen-cd/gotocodegen.h => ragel/cd-gotocodegen.h | 2 +- .../cd-ipgotocodegen.cpp | 4 +- .../ipgotocodegen.h => ragel/cd-ipgotocodegen.h | 2 +- rlgen-cd/main.cpp => ragel/cd-main.cpp | 18 +++--- rlgen-cd/rlgen-cd.h => ragel/cd-rlgen-cd.h | 0 .../splitcodegen.cpp => ragel/cd-splitcodegen.cpp | 4 +- rlgen-cd/splitcodegen.h => ragel/cd-splitcodegen.h | 2 +- rlgen-cd/tabcodegen.cpp => ragel/cd-tabcodegen.cpp | 4 +- rlgen-cd/tabcodegen.h => ragel/cd-tabcodegen.h | 2 +- {common => ragel}/common.cpp | 0 {common => ragel}/common.h | 0 {common => ragel}/config.h.in | 0 .../csharp-fflatcodegen.cpp | 4 +- .../fflatcodegen.h => ragel/csharp-fflatcodegen.h | 2 +- .../csharp-fgotocodegen.cpp | 4 +- .../fgotocodegen.h => ragel/csharp-fgotocodegen.h | 2 +- .../csharp-flatcodegen.cpp | 4 +- .../flatcodegen.h => ragel/csharp-flatcodegen.h | 2 +- .../fsmcodegen.cpp => ragel/csharp-fsmcodegen.cpp | 4 +- .../fsmcodegen.h => ragel/csharp-fsmcodegen.h | 0 .../csharp-ftabcodegen.cpp | 4 +- .../ftabcodegen.h => ragel/csharp-ftabcodegen.h | 2 +- .../csharp-gotocodegen.cpp | 4 +- .../gotocodegen.h => ragel/csharp-gotocodegen.h | 2 +- .../csharp-ipgotocodegen.cpp | 4 +- .../csharp-ipgotocodegen.h | 2 +- rlgen-csharp/main.cpp => ragel/csharp-main.cpp | 18 +++--- .../rlgen-csharp.h => ragel/csharp-rlgen-csharp.h | 0 .../csharp-splitcodegen.cpp | 4 +- .../splitcodegen.h => ragel/csharp-splitcodegen.h | 2 +- .../tabcodegen.cpp => ragel/csharp-tabcodegen.cpp | 4 +- .../tabcodegen.h => ragel/csharp-tabcodegen.h | 2 +- rlgen-dot/gvdotgen.cpp => ragel/dot-gvdotgen.cpp | 4 +- rlgen-dot/gvdotgen.h => ragel/dot-gvdotgen.h | 0 rlgen-dot/main.cpp => ragel/dot-main.cpp | 4 +- rlgen-dot/rlgen-dot.h => ragel/dot-rlgen-dot.h | 0 {redfsm => ragel}/gendata.cpp | 0 {redfsm => ragel}/gendata.h | 0 .../javacodegen.cpp => ragel/java-javacodegen.cpp | 4 +- .../javacodegen.h => ragel/java-javacodegen.h | 0 rlgen-java/main.cpp => ragel/java-main.cpp | 4 +- rlgen-java/rlgen-java.h => ragel/java-rlgen-java.h | 0 {common => ragel}/pcheck.h | 0 {redfsm => ragel}/redfsm.cpp | 0 {redfsm => ragel}/redfsm.h | 0 {rlgen-ruby => ragel}/ruby-codegen.cpp | 2 +- {rlgen-ruby => ragel}/ruby-codegen.h | 0 {rlgen-ruby => ragel}/ruby-fflatcodegen.cpp | 0 {rlgen-ruby => ragel}/ruby-fflatcodegen.h | 0 {rlgen-ruby => ragel}/ruby-flatcodegen.cpp | 2 +- {rlgen-ruby => ragel}/ruby-flatcodegen.h | 0 {rlgen-ruby => ragel}/ruby-ftabcodegen.cpp | 2 +- {rlgen-ruby => ragel}/ruby-ftabcodegen.h | 0 rlgen-ruby/main.cpp => ragel/ruby-main.cpp | 4 +- .../ruby-rbx-gotocodegen.cpp | 4 +- .../ruby-rbx-gotocodegen.h | 0 rlgen-ruby/rlgen-ruby.h => ragel/ruby-rlgen-ruby.h | 0 {rlgen-ruby => ragel}/ruby-tabcodegen.cpp | 2 +- {rlgen-ruby => ragel}/ruby-tabcodegen.h | 0 {redfsm => ragel}/xmlparse.kh | 0 {redfsm => ragel}/xmlparse.kl | 0 {redfsm => ragel}/xmlscan.rl | 0 {redfsm => ragel}/xmltags.gperf | 0 rlgen-cd/Makefile.in | 71 --------------------- rlgen-csharp/Makefile.in | 71 --------------------- rlgen-dot/Makefile.in | 67 -------------------- rlgen-java/Makefile.in | 68 -------------------- rlgen-ruby/Makefile.in | 69 --------------------- 85 files changed, 132 insertions(+), 528 deletions(-) delete mode 100644 common/Makefile.in rename {common => ragel}/buffer.h (100%) rename rlgen-cd/fflatcodegen.cpp => ragel/cd-fflatcodegen.cpp (99%) rename rlgen-cd/fflatcodegen.h => ragel/cd-fflatcodegen.h (98%) rename rlgen-cd/fgotocodegen.cpp => ragel/cd-fgotocodegen.cpp (99%) rename rlgen-cd/fgotocodegen.h => ragel/cd-fgotocodegen.h (98%) rename rlgen-cd/flatcodegen.cpp => ragel/cd-flatcodegen.cpp (99%) rename rlgen-cd/flatcodegen.h => ragel/cd-flatcodegen.h (99%) rename rlgen-cd/fsmcodegen.cpp => ragel/cd-fsmcodegen.cpp (99%) rename rlgen-cd/fsmcodegen.h => ragel/cd-fsmcodegen.h (100%) rename rlgen-cd/ftabcodegen.cpp => ragel/cd-ftabcodegen.cpp (99%) rename rlgen-cd/ftabcodegen.h => ragel/cd-ftabcodegen.h (98%) rename rlgen-cd/gotocodegen.cpp => ragel/cd-gotocodegen.cpp (99%) rename rlgen-cd/gotocodegen.h => ragel/cd-gotocodegen.h (99%) rename rlgen-cd/ipgotocodegen.cpp => ragel/cd-ipgotocodegen.cpp (99%) rename rlgen-cd/ipgotocodegen.h => ragel/cd-ipgotocodegen.h (99%) rename rlgen-cd/main.cpp => ragel/cd-main.cpp (94%) rename rlgen-cd/rlgen-cd.h => ragel/cd-rlgen-cd.h (100%) rename rlgen-cd/splitcodegen.cpp => ragel/cd-splitcodegen.cpp (99%) rename rlgen-cd/splitcodegen.h => ragel/cd-splitcodegen.h (98%) rename rlgen-cd/tabcodegen.cpp => ragel/cd-tabcodegen.cpp (99%) rename rlgen-cd/tabcodegen.h => ragel/cd-tabcodegen.h (99%) rename {common => ragel}/common.cpp (100%) rename {common => ragel}/common.h (100%) rename {common => ragel}/config.h.in (100%) rename rlgen-csharp/fflatcodegen.cpp => ragel/csharp-fflatcodegen.cpp (99%) rename rlgen-csharp/fflatcodegen.h => ragel/csharp-fflatcodegen.h (98%) rename rlgen-csharp/fgotocodegen.cpp => ragel/csharp-fgotocodegen.cpp (99%) rename rlgen-csharp/fgotocodegen.h => ragel/csharp-fgotocodegen.h (98%) rename rlgen-csharp/flatcodegen.cpp => ragel/csharp-flatcodegen.cpp (99%) rename rlgen-csharp/flatcodegen.h => ragel/csharp-flatcodegen.h (98%) rename rlgen-csharp/fsmcodegen.cpp => ragel/csharp-fsmcodegen.cpp (99%) rename rlgen-csharp/fsmcodegen.h => ragel/csharp-fsmcodegen.h (100%) rename rlgen-csharp/ftabcodegen.cpp => ragel/csharp-ftabcodegen.cpp (99%) rename rlgen-csharp/ftabcodegen.h => ragel/csharp-ftabcodegen.h (98%) rename rlgen-csharp/gotocodegen.cpp => ragel/csharp-gotocodegen.cpp (99%) rename rlgen-csharp/gotocodegen.h => ragel/csharp-gotocodegen.h (99%) rename rlgen-csharp/ipgotocodegen.cpp => ragel/csharp-ipgotocodegen.cpp (99%) rename rlgen-csharp/ipgotocodegen.h => ragel/csharp-ipgotocodegen.h (98%) rename rlgen-csharp/main.cpp => ragel/csharp-main.cpp (92%) rename rlgen-csharp/rlgen-csharp.h => ragel/csharp-rlgen-csharp.h (100%) rename rlgen-csharp/splitcodegen.cpp => ragel/csharp-splitcodegen.cpp (99%) rename rlgen-csharp/splitcodegen.h => ragel/csharp-splitcodegen.h (98%) rename rlgen-csharp/tabcodegen.cpp => ragel/csharp-tabcodegen.cpp (99%) rename rlgen-csharp/tabcodegen.h => ragel/csharp-tabcodegen.h (99%) rename rlgen-dot/gvdotgen.cpp => ragel/dot-gvdotgen.cpp (99%) rename rlgen-dot/gvdotgen.h => ragel/dot-gvdotgen.h (100%) rename rlgen-dot/main.cpp => ragel/dot-main.cpp (98%) rename rlgen-dot/rlgen-dot.h => ragel/dot-rlgen-dot.h (100%) rename {redfsm => ragel}/gendata.cpp (100%) rename {redfsm => ragel}/gendata.h (100%) rename rlgen-java/javacodegen.cpp => ragel/java-javacodegen.cpp (99%) rename rlgen-java/javacodegen.h => ragel/java-javacodegen.h (100%) rename rlgen-java/main.cpp => ragel/java-main.cpp (98%) rename rlgen-java/rlgen-java.h => ragel/java-rlgen-java.h (100%) rename {common => ragel}/pcheck.h (100%) rename {redfsm => ragel}/redfsm.cpp (100%) rename {redfsm => ragel}/redfsm.h (100%) rename {rlgen-ruby => ragel}/ruby-codegen.cpp (99%) rename {rlgen-ruby => ragel}/ruby-codegen.h (100%) rename {rlgen-ruby => ragel}/ruby-fflatcodegen.cpp (100%) rename {rlgen-ruby => ragel}/ruby-fflatcodegen.h (100%) rename {rlgen-ruby => ragel}/ruby-flatcodegen.cpp (99%) rename {rlgen-ruby => ragel}/ruby-flatcodegen.h (100%) rename {rlgen-ruby => ragel}/ruby-ftabcodegen.cpp (99%) rename {rlgen-ruby => ragel}/ruby-ftabcodegen.h (100%) rename rlgen-ruby/main.cpp => ragel/ruby-main.cpp (98%) rename rlgen-ruby/rbx-gotocodegen.cpp => ragel/ruby-rbx-gotocodegen.cpp (99%) rename rlgen-ruby/rbx-gotocodegen.h => ragel/ruby-rbx-gotocodegen.h (100%) rename rlgen-ruby/rlgen-ruby.h => ragel/ruby-rlgen-ruby.h (100%) rename {rlgen-ruby => ragel}/ruby-tabcodegen.cpp (99%) rename {rlgen-ruby => ragel}/ruby-tabcodegen.h (100%) rename {redfsm => ragel}/xmlparse.kh (100%) rename {redfsm => ragel}/xmlparse.kl (100%) rename {redfsm => ragel}/xmlscan.rl (100%) rename {redfsm => ragel}/xmltags.gperf (100%) delete mode 100644 rlgen-cd/Makefile.in delete mode 100644 rlgen-csharp/Makefile.in delete mode 100644 rlgen-dot/Makefile.in delete mode 100644 rlgen-java/Makefile.in delete mode 100644 rlgen-ruby/Makefile.in diff --git a/Makefile.in b/Makefile.in index 7146ed3..9ad1f81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,9 +18,8 @@ # along with Ragel; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -BUILD_COMMON = common redfsm rlgen-cd rlgen-java rlgen-ruby rlgen-csharp rlgen-dot BUILD_SUBDIRS = ragel -ALL_SUBDIRS = $(BUILD_COMMON) $(BUILD_SUBDIRS) test examples doc +ALL_SUBDIRS = $(BUILD_SUBDIRS) test examples doc #************************************* @@ -35,9 +34,6 @@ all: $(BUILD_SUBDIRS) .PHONY: $(ALL_SUBDIRS) -$(BUILD_COMMON): - @cd $@ && $(MAKE) - $(BUILD_SUBDIRS): $(BUILD_COMMON) @cd $@ && $(MAKE) diff --git a/common/Makefile.in b/common/Makefile.in deleted file mode 100644 index c0a3a34..0000000 --- a/common/Makefile.in +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright 2001-2006 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = common.cpp - -GEN_SRC = version.h - -#************************************* -prefix = @prefix@ - -# Programs -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# rules - -all: common.a - -common.a: $(GEN_SRC) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -version.h: ../version.mk - echo '#define VERSION "$(VERSION)"' > version.h - echo '#define PUBDATE "$(PUBDATE)"' >> version.h - echo '#define PREFIX "$(prefix)"' >> version.h - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile config.h - -clean: - rm -f tags version.h .*.d *.o common.a - -install: all - @true - --include $(DEPS) diff --git a/configure b/configure index 47a1e4a..d899390 100755 --- a/configure +++ b/configure @@ -1649,7 +1649,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers common/config.h" +ac_config_headers="$ac_config_headers ragel/config.h" BUILD_PARSERS=true @@ -4115,7 +4115,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "common/config.h") CONFIG_HEADERS="$CONFIG_HEADERS common/config.h" ;; + "ragel/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ragel/config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; "ragel/Makefile") CONFIG_FILES="$CONFIG_FILES ragel/Makefile" ;; diff --git a/configure.in b/configure.in index 787e720..7bc0195 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ dnl along with Ragel; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA AC_INIT(ragel/main.cpp) -AC_CONFIG_HEADER(common/config.h) +AC_CONFIG_HEADER(ragel/config.h) dnl Set to true if build system should generate parsers from ragel, kelbt, and dnl gperf sources. Set to false if generated files are included and not to be diff --git a/ragel/Makefile.in b/ragel/Makefile.in index 30d6917..02f2b7c 100644 --- a/ragel/Makefile.in +++ b/ragel/Makefile.in @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Adrian Thurston +# Copyright 2001-2008 Adrian Thurston # # This file is part of Ragel. @@ -18,7 +18,7 @@ # along with Ragel; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCS += -I../common -I../aapl -I../redfsm +INCS += -I../aapl DEFS += CXXFLAGS += -g -Wall @@ -27,19 +27,25 @@ LDFLAGS += CC_SRCS = \ main.cpp parsetree.cpp parsedata.cpp fsmstate.cpp fsmbase.cpp \ fsmattach.cpp fsmmin.cpp fsmgraph.cpp fsmap.cpp xmlcodegen.cpp \ - rlscan.cpp rlparse.cpp inputdata.cpp - -GEN_SRC = rlscan.cpp rlparse.h rlparse.cpp - -RAGEL_LIBS = ../common/common.a \ - ../redfsm/redfsm.a \ - ../rlgen-cd/rlgen-cd.a \ - ../rlgen-java/rlgen-java.a \ - ../rlgen-ruby/rlgen-ruby.a \ - ../rlgen-csharp/rlgen-csharp.a \ - ../rlgen-dot/rlgen-dot.a - -LIBS = $(RAGEL_LIBS) + rlscan.cpp rlparse.cpp inputdata.cpp common.cpp \ + redfsm.cpp gendata.cpp xmltags.cpp xmlscan.cpp xmlparse.cpp \ + cd-main.cpp cd-fsmcodegen.cpp \ + cd-tabcodegen.cpp cd-ftabcodegen.cpp cd-flatcodegen.cpp \ + cd-fflatcodegen.cpp cd-gotocodegen.cpp cd-fgotocodegen.cpp \ + cd-ipgotocodegen.cpp cd-splitcodegen.cpp \ + java-main.cpp java-javacodegen.cpp \ + ruby-main.cpp ruby-codegen.cpp ruby-tabcodegen.cpp ruby-ftabcodegen.cpp \ + ruby-flatcodegen.cpp ruby-fflatcodegen.cpp ruby-rbx-gotocodegen.cpp \ + csharp-main.cpp csharp-fsmcodegen.cpp \ + csharp-tabcodegen.cpp csharp-ftabcodegen.cpp csharp-flatcodegen.cpp \ + csharp-fflatcodegen.cpp csharp-gotocodegen.cpp csharp-fgotocodegen.cpp \ + csharp-ipgotocodegen.cpp csharp-splitcodegen.cpp \ + dot-main.cpp dot-gvdotgen.cpp + +GEN_SRC = version.h rlscan.cpp rlparse.h rlparse.cpp \ + xmltags.cpp xmlscan.cpp xmlparse.cpp xmlparse.h + +LIBS = MINGW_LIBS = -lpsapi #************************************* @@ -57,12 +63,20 @@ endif OBJS = $(CC_SRCS:%.cpp=%.o) DEPS = $(CC_SRCS:%.cpp=.%.d) +# Get the version info. +include ../version.mk + # Rules. all: ragel$(EXEEXT) -ragel$(EXEEXT): $(GEN_SRC) $(OBJS) $(RAGEL_LIBS) +ragel$(EXEEXT): $(GEN_SRC) $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) +version.h: ../version.mk + echo '#define VERSION "$(VERSION)"' > version.h + echo '#define PUBDATE "$(PUBDATE)"' >> version.h + echo '#define PREFIX "$(prefix)"' >> version.h + ifeq ($(BUILD_PARSERS),true) rlparse.h: rlparse.kh @@ -78,6 +92,18 @@ rlscan.cpp: rlparse.h rlscan.cpp: rlscan.rl ragel -G2 -o $@ $< +xmlparse.h: xmlparse.kh + kelbt -o $@ $< + +xmlparse.cpp: xmlparse.kl xmlparse.kh + kelbt -o $@ $< + +xmlscan.cpp: xmlscan.rl + ragel -G2 -o xmlscan.cpp xmlscan.rl + +xmltags.cpp: xmltags.gperf + gperf -L C++ -t $< > $@ + endif %.o: %.cpp diff --git a/common/buffer.h b/ragel/buffer.h similarity index 100% rename from common/buffer.h rename to ragel/buffer.h diff --git a/rlgen-cd/fflatcodegen.cpp b/ragel/cd-fflatcodegen.cpp similarity index 99% rename from rlgen-cd/fflatcodegen.cpp rename to ragel/cd-fflatcodegen.cpp index 0401c49..40c3e6d 100644 --- a/rlgen-cd/fflatcodegen.cpp +++ b/ragel/cd-fflatcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "fflatcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-fflatcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-cd/fflatcodegen.h b/ragel/cd-fflatcodegen.h similarity index 98% rename from rlgen-cd/fflatcodegen.h rename to ragel/cd-fflatcodegen.h index 6ac0b0d..8d5d7fa 100644 --- a/rlgen-cd/fflatcodegen.h +++ b/ragel/cd-fflatcodegen.h @@ -25,7 +25,7 @@ #define _FFLATCODEGEN_H #include -#include "flatcodegen.h" +#include "cd-flatcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/fgotocodegen.cpp b/ragel/cd-fgotocodegen.cpp similarity index 99% rename from rlgen-cd/fgotocodegen.cpp rename to ragel/cd-fgotocodegen.cpp index 443b416..ad4ee3e 100644 --- a/rlgen-cd/fgotocodegen.cpp +++ b/ragel/cd-fgotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "fgotocodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-fgotocodegen.h" #include "redfsm.h" #include "gendata.h" #include "bstmap.h" diff --git a/rlgen-cd/fgotocodegen.h b/ragel/cd-fgotocodegen.h similarity index 98% rename from rlgen-cd/fgotocodegen.h rename to ragel/cd-fgotocodegen.h index 287b9dc..dcbd737 100644 --- a/rlgen-cd/fgotocodegen.h +++ b/ragel/cd-fgotocodegen.h @@ -25,7 +25,7 @@ #define _FGOTOCODEGEN_H #include -#include "gotocodegen.h" +#include "cd-gotocodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/flatcodegen.cpp b/ragel/cd-flatcodegen.cpp similarity index 99% rename from rlgen-cd/flatcodegen.cpp rename to ragel/cd-flatcodegen.cpp index f753526..7630782 100644 --- a/rlgen-cd/flatcodegen.cpp +++ b/ragel/cd-flatcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "flatcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-flatcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-cd/flatcodegen.h b/ragel/cd-flatcodegen.h similarity index 99% rename from rlgen-cd/flatcodegen.h rename to ragel/cd-flatcodegen.h index f568546..3dba38d 100644 --- a/rlgen-cd/flatcodegen.h +++ b/ragel/cd-flatcodegen.h @@ -25,7 +25,7 @@ #define _FLATCODEGEN_H #include -#include "fsmcodegen.h" +#include "cd-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/fsmcodegen.cpp b/ragel/cd-fsmcodegen.cpp similarity index 99% rename from rlgen-cd/fsmcodegen.cpp rename to ragel/cd-fsmcodegen.cpp index cbe2501..a2f2b79 100644 --- a/rlgen-cd/fsmcodegen.cpp +++ b/ragel/cd-fsmcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "fsmcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-fsmcodegen.h" #include "redfsm.h" #include "gendata.h" #include diff --git a/rlgen-cd/fsmcodegen.h b/ragel/cd-fsmcodegen.h similarity index 100% rename from rlgen-cd/fsmcodegen.h rename to ragel/cd-fsmcodegen.h diff --git a/rlgen-cd/ftabcodegen.cpp b/ragel/cd-ftabcodegen.cpp similarity index 99% rename from rlgen-cd/ftabcodegen.cpp rename to ragel/cd-ftabcodegen.cpp index a1d0a21..43c338b 100644 --- a/rlgen-cd/ftabcodegen.cpp +++ b/ragel/cd-ftabcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "ftabcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-ftabcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-cd/ftabcodegen.h b/ragel/cd-ftabcodegen.h similarity index 98% rename from rlgen-cd/ftabcodegen.h rename to ragel/cd-ftabcodegen.h index 5de73e5..10431d5 100644 --- a/rlgen-cd/ftabcodegen.h +++ b/ragel/cd-ftabcodegen.h @@ -25,7 +25,7 @@ #define _FTABCODEGEN_H #include -#include "tabcodegen.h" +#include "cd-tabcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/gotocodegen.cpp b/ragel/cd-gotocodegen.cpp similarity index 99% rename from rlgen-cd/gotocodegen.cpp rename to ragel/cd-gotocodegen.cpp index 943a089..38093a2 100644 --- a/rlgen-cd/gotocodegen.cpp +++ b/ragel/cd-gotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "gotocodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-gotocodegen.h" #include "redfsm.h" #include "bstmap.h" #include "gendata.h" diff --git a/rlgen-cd/gotocodegen.h b/ragel/cd-gotocodegen.h similarity index 99% rename from rlgen-cd/gotocodegen.h rename to ragel/cd-gotocodegen.h index 11ce134..18b8a48 100644 --- a/rlgen-cd/gotocodegen.h +++ b/ragel/cd-gotocodegen.h @@ -25,7 +25,7 @@ #define _GOTOCODEGEN_H #include -#include "fsmcodegen.h" +#include "cd-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/ipgotocodegen.cpp b/ragel/cd-ipgotocodegen.cpp similarity index 99% rename from rlgen-cd/ipgotocodegen.cpp rename to ragel/cd-ipgotocodegen.cpp index 0a2b019..6f458be 100644 --- a/rlgen-cd/ipgotocodegen.cpp +++ b/ragel/cd-ipgotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "ipgotocodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-ipgotocodegen.h" #include "redfsm.h" #include "gendata.h" #include "bstmap.h" diff --git a/rlgen-cd/ipgotocodegen.h b/ragel/cd-ipgotocodegen.h similarity index 99% rename from rlgen-cd/ipgotocodegen.h rename to ragel/cd-ipgotocodegen.h index 7b815ab..4de0701 100644 --- a/rlgen-cd/ipgotocodegen.h +++ b/ragel/cd-ipgotocodegen.h @@ -25,7 +25,7 @@ #define _IPGCODEGEN_H #include -#include "gotocodegen.h" +#include "cd-gotocodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-cd/main.cpp b/ragel/cd-main.cpp similarity index 94% rename from rlgen-cd/main.cpp rename to ragel/cd-main.cpp index c1542eb..267a740 100644 --- a/rlgen-cd/main.cpp +++ b/ragel/cd-main.cpp @@ -27,21 +27,21 @@ #include #include "common.h" -#include "rlgen-cd.h" +#include "cd-rlgen-cd.h" #include "xmlparse.h" #include "pcheck.h" #include "vector.h" #include "version.h" /* Code generators. */ -#include "tabcodegen.h" -#include "ftabcodegen.h" -#include "flatcodegen.h" -#include "fflatcodegen.h" -#include "gotocodegen.h" -#include "fgotocodegen.h" -#include "ipgotocodegen.h" -#include "splitcodegen.h" +#include "cd-tabcodegen.h" +#include "cd-ftabcodegen.h" +#include "cd-flatcodegen.h" +#include "cd-fflatcodegen.h" +#include "cd-gotocodegen.h" +#include "cd-fgotocodegen.h" +#include "cd-ipgotocodegen.h" +#include "cd-splitcodegen.h" using std::istream; using std::ifstream; diff --git a/rlgen-cd/rlgen-cd.h b/ragel/cd-rlgen-cd.h similarity index 100% rename from rlgen-cd/rlgen-cd.h rename to ragel/cd-rlgen-cd.h diff --git a/rlgen-cd/splitcodegen.cpp b/ragel/cd-splitcodegen.cpp similarity index 99% rename from rlgen-cd/splitcodegen.cpp rename to ragel/cd-splitcodegen.cpp index aa9ce5c..4e2a724 100644 --- a/rlgen-cd/splitcodegen.cpp +++ b/ragel/cd-splitcodegen.cpp @@ -20,8 +20,8 @@ */ -#include "rlgen-cd.h" -#include "splitcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-splitcodegen.h" #include "gendata.h" #include diff --git a/rlgen-cd/splitcodegen.h b/ragel/cd-splitcodegen.h similarity index 98% rename from rlgen-cd/splitcodegen.h rename to ragel/cd-splitcodegen.h index 29ce42e..995e343 100644 --- a/rlgen-cd/splitcodegen.h +++ b/ragel/cd-splitcodegen.h @@ -22,7 +22,7 @@ #ifndef _SPLITCODEGEN_H #define _SPLITCODEGEN_H -#include "ipgotocodegen.h" +#include "cd-ipgotocodegen.h" class SplitCodeGen : public IpGotoCodeGen { diff --git a/rlgen-cd/tabcodegen.cpp b/ragel/cd-tabcodegen.cpp similarity index 99% rename from rlgen-cd/tabcodegen.cpp rename to ragel/cd-tabcodegen.cpp index 6754362..96033b4 100644 --- a/rlgen-cd/tabcodegen.cpp +++ b/ragel/cd-tabcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-cd.h" -#include "tabcodegen.h" +#include "cd-rlgen-cd.h" +#include "cd-tabcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-cd/tabcodegen.h b/ragel/cd-tabcodegen.h similarity index 99% rename from rlgen-cd/tabcodegen.h rename to ragel/cd-tabcodegen.h index bdcd392..fec2925 100644 --- a/rlgen-cd/tabcodegen.h +++ b/ragel/cd-tabcodegen.h @@ -25,7 +25,7 @@ #define _TABCODEGEN_H #include -#include "fsmcodegen.h" +#include "cd-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/common/common.cpp b/ragel/common.cpp similarity index 100% rename from common/common.cpp rename to ragel/common.cpp diff --git a/common/common.h b/ragel/common.h similarity index 100% rename from common/common.h rename to ragel/common.h diff --git a/common/config.h.in b/ragel/config.h.in similarity index 100% rename from common/config.h.in rename to ragel/config.h.in diff --git a/rlgen-csharp/fflatcodegen.cpp b/ragel/csharp-fflatcodegen.cpp similarity index 99% rename from rlgen-csharp/fflatcodegen.cpp rename to ragel/csharp-fflatcodegen.cpp index 0edd7cf..a307159 100644 --- a/rlgen-csharp/fflatcodegen.cpp +++ b/ragel/csharp-fflatcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "fflatcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-fflatcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-csharp/fflatcodegen.h b/ragel/csharp-fflatcodegen.h similarity index 98% rename from rlgen-csharp/fflatcodegen.h rename to ragel/csharp-fflatcodegen.h index dd25d83..a5007b9 100644 --- a/rlgen-csharp/fflatcodegen.h +++ b/ragel/csharp-fflatcodegen.h @@ -25,7 +25,7 @@ #define _FFLATCODEGEN_H #include -#include "flatcodegen.h" +#include "csharp-flatcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/fgotocodegen.cpp b/ragel/csharp-fgotocodegen.cpp similarity index 99% rename from rlgen-csharp/fgotocodegen.cpp rename to ragel/csharp-fgotocodegen.cpp index f19684a..906419c 100644 --- a/rlgen-csharp/fgotocodegen.cpp +++ b/ragel/csharp-fgotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "fgotocodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-fgotocodegen.h" #include "redfsm.h" #include "gendata.h" #include "bstmap.h" diff --git a/rlgen-csharp/fgotocodegen.h b/ragel/csharp-fgotocodegen.h similarity index 98% rename from rlgen-csharp/fgotocodegen.h rename to ragel/csharp-fgotocodegen.h index 68c7368..283b827 100644 --- a/rlgen-csharp/fgotocodegen.h +++ b/ragel/csharp-fgotocodegen.h @@ -25,7 +25,7 @@ #define _FGOTOCODEGEN_H #include -#include "gotocodegen.h" +#include "csharp-gotocodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/flatcodegen.cpp b/ragel/csharp-flatcodegen.cpp similarity index 99% rename from rlgen-csharp/flatcodegen.cpp rename to ragel/csharp-flatcodegen.cpp index 9dd191a..c59bfb4 100644 --- a/rlgen-csharp/flatcodegen.cpp +++ b/ragel/csharp-flatcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "flatcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-flatcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-csharp/flatcodegen.h b/ragel/csharp-flatcodegen.h similarity index 98% rename from rlgen-csharp/flatcodegen.h rename to ragel/csharp-flatcodegen.h index 559cc34..ae3eadf 100644 --- a/rlgen-csharp/flatcodegen.h +++ b/ragel/csharp-flatcodegen.h @@ -25,7 +25,7 @@ #define _FLATCODEGEN_H #include -#include "fsmcodegen.h" +#include "csharp-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/fsmcodegen.cpp b/ragel/csharp-fsmcodegen.cpp similarity index 99% rename from rlgen-csharp/fsmcodegen.cpp rename to ragel/csharp-fsmcodegen.cpp index a1b1c5d..35319a0 100644 --- a/rlgen-csharp/fsmcodegen.cpp +++ b/ragel/csharp-fsmcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "fsmcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-fsmcodegen.h" #include "redfsm.h" #include "gendata.h" #include diff --git a/rlgen-csharp/fsmcodegen.h b/ragel/csharp-fsmcodegen.h similarity index 100% rename from rlgen-csharp/fsmcodegen.h rename to ragel/csharp-fsmcodegen.h diff --git a/rlgen-csharp/ftabcodegen.cpp b/ragel/csharp-ftabcodegen.cpp similarity index 99% rename from rlgen-csharp/ftabcodegen.cpp rename to ragel/csharp-ftabcodegen.cpp index 9ca8ce1..7a5ae6b 100644 --- a/rlgen-csharp/ftabcodegen.cpp +++ b/ragel/csharp-ftabcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "ftabcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-ftabcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-csharp/ftabcodegen.h b/ragel/csharp-ftabcodegen.h similarity index 98% rename from rlgen-csharp/ftabcodegen.h rename to ragel/csharp-ftabcodegen.h index 173a3ce..00ed579 100644 --- a/rlgen-csharp/ftabcodegen.h +++ b/ragel/csharp-ftabcodegen.h @@ -25,7 +25,7 @@ #define _FTABCODEGEN_H #include -#include "tabcodegen.h" +#include "csharp-tabcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/gotocodegen.cpp b/ragel/csharp-gotocodegen.cpp similarity index 99% rename from rlgen-csharp/gotocodegen.cpp rename to ragel/csharp-gotocodegen.cpp index 2fcf67b..508e558 100644 --- a/rlgen-csharp/gotocodegen.cpp +++ b/ragel/csharp-gotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "gotocodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-gotocodegen.h" #include "redfsm.h" #include "bstmap.h" #include "gendata.h" diff --git a/rlgen-csharp/gotocodegen.h b/ragel/csharp-gotocodegen.h similarity index 99% rename from rlgen-csharp/gotocodegen.h rename to ragel/csharp-gotocodegen.h index b686641..fab1428 100644 --- a/rlgen-csharp/gotocodegen.h +++ b/ragel/csharp-gotocodegen.h @@ -25,7 +25,7 @@ #define _GOTOCODEGEN_H #include -#include "fsmcodegen.h" +#include "csharp-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/ipgotocodegen.cpp b/ragel/csharp-ipgotocodegen.cpp similarity index 99% rename from rlgen-csharp/ipgotocodegen.cpp rename to ragel/csharp-ipgotocodegen.cpp index aa3f36d..c0c5cc2 100644 --- a/rlgen-csharp/ipgotocodegen.cpp +++ b/ragel/csharp-ipgotocodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "ipgotocodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-ipgotocodegen.h" #include "redfsm.h" #include "gendata.h" #include "bstmap.h" diff --git a/rlgen-csharp/ipgotocodegen.h b/ragel/csharp-ipgotocodegen.h similarity index 98% rename from rlgen-csharp/ipgotocodegen.h rename to ragel/csharp-ipgotocodegen.h index 0b9a300..c04d04f 100644 --- a/rlgen-csharp/ipgotocodegen.h +++ b/ragel/csharp-ipgotocodegen.h @@ -25,7 +25,7 @@ #define _IPGCODEGEN_H #include -#include "gotocodegen.h" +#include "csharp-gotocodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-csharp/main.cpp b/ragel/csharp-main.cpp similarity index 92% rename from rlgen-csharp/main.cpp rename to ragel/csharp-main.cpp index 121a2d7..d246b54 100644 --- a/rlgen-csharp/main.cpp +++ b/ragel/csharp-main.cpp @@ -27,21 +27,21 @@ #include #include "common.h" -#include "rlgen-csharp.h" +#include "csharp-rlgen-csharp.h" #include "xmlparse.h" #include "pcheck.h" #include "vector.h" #include "version.h" /* Code generators. */ -#include "tabcodegen.h" -#include "ftabcodegen.h" -#include "flatcodegen.h" -#include "fflatcodegen.h" -#include "gotocodegen.h" -#include "fgotocodegen.h" -#include "ipgotocodegen.h" -#include "splitcodegen.h" +#include "csharp-tabcodegen.h" +#include "csharp-ftabcodegen.h" +#include "csharp-flatcodegen.h" +#include "csharp-fflatcodegen.h" +#include "csharp-gotocodegen.h" +#include "csharp-fgotocodegen.h" +#include "csharp-ipgotocodegen.h" +#include "csharp-splitcodegen.h" using std::istream; using std::ifstream; diff --git a/rlgen-csharp/rlgen-csharp.h b/ragel/csharp-rlgen-csharp.h similarity index 100% rename from rlgen-csharp/rlgen-csharp.h rename to ragel/csharp-rlgen-csharp.h diff --git a/rlgen-csharp/splitcodegen.cpp b/ragel/csharp-splitcodegen.cpp similarity index 99% rename from rlgen-csharp/splitcodegen.cpp rename to ragel/csharp-splitcodegen.cpp index 169f0a4..cdcba8d 100644 --- a/rlgen-csharp/splitcodegen.cpp +++ b/ragel/csharp-splitcodegen.cpp @@ -20,8 +20,8 @@ */ -#include "rlgen-csharp.h" -#include "splitcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-splitcodegen.h" #include "gendata.h" #include diff --git a/rlgen-csharp/splitcodegen.h b/ragel/csharp-splitcodegen.h similarity index 98% rename from rlgen-csharp/splitcodegen.h rename to ragel/csharp-splitcodegen.h index 9bfbe79..53fe118 100644 --- a/rlgen-csharp/splitcodegen.h +++ b/ragel/csharp-splitcodegen.h @@ -22,7 +22,7 @@ #ifndef _SPLITCODEGEN_H #define _SPLITCODEGEN_H -#include "ipgotocodegen.h" +#include "csharp-ipgotocodegen.h" class CSharpSplitCodeGen : public CSharpIpGotoCodeGen { diff --git a/rlgen-csharp/tabcodegen.cpp b/ragel/csharp-tabcodegen.cpp similarity index 99% rename from rlgen-csharp/tabcodegen.cpp rename to ragel/csharp-tabcodegen.cpp index 30a2bf2..711f72b 100644 --- a/rlgen-csharp/tabcodegen.cpp +++ b/ragel/csharp-tabcodegen.cpp @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-csharp.h" -#include "tabcodegen.h" +#include "csharp-rlgen-csharp.h" +#include "csharp-tabcodegen.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-csharp/tabcodegen.h b/ragel/csharp-tabcodegen.h similarity index 99% rename from rlgen-csharp/tabcodegen.h rename to ragel/csharp-tabcodegen.h index c54afd5..19ca444 100644 --- a/rlgen-csharp/tabcodegen.h +++ b/ragel/csharp-tabcodegen.h @@ -25,7 +25,7 @@ #define _TABCODEGEN_H #include -#include "fsmcodegen.h" +#include "csharp-fsmcodegen.h" /* Forwards. */ struct CodeGenData; diff --git a/rlgen-dot/gvdotgen.cpp b/ragel/dot-gvdotgen.cpp similarity index 99% rename from rlgen-dot/gvdotgen.cpp rename to ragel/dot-gvdotgen.cpp index b02ef74..d80f6b7 100644 --- a/rlgen-dot/gvdotgen.cpp +++ b/ragel/dot-gvdotgen.cpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-dot.h" -#include "gvdotgen.h" +#include "dot-rlgen-dot.h" +#include "dot-gvdotgen.h" #include "gendata.h" using namespace std; diff --git a/rlgen-dot/gvdotgen.h b/ragel/dot-gvdotgen.h similarity index 100% rename from rlgen-dot/gvdotgen.h rename to ragel/dot-gvdotgen.h diff --git a/rlgen-dot/main.cpp b/ragel/dot-main.cpp similarity index 98% rename from rlgen-dot/main.cpp rename to ragel/dot-main.cpp index 849d123..263aa4a 100644 --- a/rlgen-dot/main.cpp +++ b/ragel/dot-main.cpp @@ -27,12 +27,12 @@ #include #include "common.h" -#include "rlgen-dot.h" +#include "dot-rlgen-dot.h" #include "xmlparse.h" #include "pcheck.h" #include "vector.h" #include "version.h" -#include "gvdotgen.h" +#include "dot-gvdotgen.h" using std::istream; using std::ifstream; diff --git a/rlgen-dot/rlgen-dot.h b/ragel/dot-rlgen-dot.h similarity index 100% rename from rlgen-dot/rlgen-dot.h rename to ragel/dot-rlgen-dot.h diff --git a/redfsm/gendata.cpp b/ragel/gendata.cpp similarity index 100% rename from redfsm/gendata.cpp rename to ragel/gendata.cpp diff --git a/redfsm/gendata.h b/ragel/gendata.h similarity index 100% rename from redfsm/gendata.h rename to ragel/gendata.h diff --git a/rlgen-java/javacodegen.cpp b/ragel/java-javacodegen.cpp similarity index 99% rename from rlgen-java/javacodegen.cpp rename to ragel/java-javacodegen.cpp index 763c495..fe9c5af 100644 --- a/rlgen-java/javacodegen.cpp +++ b/ragel/java-javacodegen.cpp @@ -20,8 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rlgen-java.h" -#include "javacodegen.h" +#include "java-rlgen-java.h" +#include "java-javacodegen.h" #include "redfsm.h" #include "gendata.h" #include diff --git a/rlgen-java/javacodegen.h b/ragel/java-javacodegen.h similarity index 100% rename from rlgen-java/javacodegen.h rename to ragel/java-javacodegen.h diff --git a/rlgen-java/main.cpp b/ragel/java-main.cpp similarity index 98% rename from rlgen-java/main.cpp rename to ragel/java-main.cpp index 6bbe7b2..87992da 100644 --- a/rlgen-java/main.cpp +++ b/ragel/java-main.cpp @@ -26,13 +26,13 @@ #include #include -#include "rlgen-java.h" +#include "java-rlgen-java.h" #include "xmlparse.h" #include "pcheck.h" #include "vector.h" #include "version.h" #include "common.h" -#include "javacodegen.h" +#include "java-javacodegen.h" using std::istream; using std::ifstream; diff --git a/rlgen-java/rlgen-java.h b/ragel/java-rlgen-java.h similarity index 100% rename from rlgen-java/rlgen-java.h rename to ragel/java-rlgen-java.h diff --git a/common/pcheck.h b/ragel/pcheck.h similarity index 100% rename from common/pcheck.h rename to ragel/pcheck.h diff --git a/redfsm/redfsm.cpp b/ragel/redfsm.cpp similarity index 100% rename from redfsm/redfsm.cpp rename to ragel/redfsm.cpp diff --git a/redfsm/redfsm.h b/ragel/redfsm.h similarity index 100% rename from redfsm/redfsm.h rename to ragel/redfsm.h diff --git a/rlgen-ruby/ruby-codegen.cpp b/ragel/ruby-codegen.cpp similarity index 99% rename from rlgen-ruby/ruby-codegen.cpp rename to ragel/ruby-codegen.cpp index 8974af6..8680387 100644 --- a/rlgen-ruby/ruby-codegen.cpp +++ b/ragel/ruby-codegen.cpp @@ -24,7 +24,7 @@ #include #include "redfsm.h" #include "gendata.h" -#include "rlgen-ruby.h" +#include "ruby-rlgen-ruby.h" #include "ruby-codegen.h" using std::ostream; diff --git a/rlgen-ruby/ruby-codegen.h b/ragel/ruby-codegen.h similarity index 100% rename from rlgen-ruby/ruby-codegen.h rename to ragel/ruby-codegen.h diff --git a/rlgen-ruby/ruby-fflatcodegen.cpp b/ragel/ruby-fflatcodegen.cpp similarity index 100% rename from rlgen-ruby/ruby-fflatcodegen.cpp rename to ragel/ruby-fflatcodegen.cpp diff --git a/rlgen-ruby/ruby-fflatcodegen.h b/ragel/ruby-fflatcodegen.h similarity index 100% rename from rlgen-ruby/ruby-fflatcodegen.h rename to ragel/ruby-fflatcodegen.h diff --git a/rlgen-ruby/ruby-flatcodegen.cpp b/ragel/ruby-flatcodegen.cpp similarity index 99% rename from rlgen-ruby/ruby-flatcodegen.cpp rename to ragel/ruby-flatcodegen.cpp index bf30988..8925aae 100644 --- a/rlgen-ruby/ruby-flatcodegen.cpp +++ b/ragel/ruby-flatcodegen.cpp @@ -21,7 +21,7 @@ */ #include "ruby-flatcodegen.h" -#include "rlgen-ruby.h" +#include "ruby-rlgen-ruby.h" #include "redfsm.h" #include "gendata.h" diff --git a/rlgen-ruby/ruby-flatcodegen.h b/ragel/ruby-flatcodegen.h similarity index 100% rename from rlgen-ruby/ruby-flatcodegen.h rename to ragel/ruby-flatcodegen.h diff --git a/rlgen-ruby/ruby-ftabcodegen.cpp b/ragel/ruby-ftabcodegen.cpp similarity index 99% rename from rlgen-ruby/ruby-ftabcodegen.cpp rename to ragel/ruby-ftabcodegen.cpp index ffb65af..a1dd613 100644 --- a/rlgen-ruby/ruby-ftabcodegen.cpp +++ b/ragel/ruby-ftabcodegen.cpp @@ -24,7 +24,7 @@ #include #include "redfsm.h" #include "gendata.h" -#include "rlgen-ruby.h" +#include "ruby-rlgen-ruby.h" #include "ruby-ftabcodegen.h" using std::ostream; diff --git a/rlgen-ruby/ruby-ftabcodegen.h b/ragel/ruby-ftabcodegen.h similarity index 100% rename from rlgen-ruby/ruby-ftabcodegen.h rename to ragel/ruby-ftabcodegen.h diff --git a/rlgen-ruby/main.cpp b/ragel/ruby-main.cpp similarity index 98% rename from rlgen-ruby/main.cpp rename to ragel/ruby-main.cpp index 08786cd..a7272c0 100644 --- a/rlgen-ruby/main.cpp +++ b/ragel/ruby-main.cpp @@ -32,12 +32,12 @@ #include "vector.h" #include "version.h" #include "common.h" -#include "rlgen-ruby.h" +#include "ruby-rlgen-ruby.h" #include "ruby-tabcodegen.h" #include "ruby-ftabcodegen.h" #include "ruby-flatcodegen.h" #include "ruby-fflatcodegen.h" -#include "rbx-gotocodegen.h" +#include "ruby-rbx-gotocodegen.h" using std::istream; using std::ifstream; diff --git a/rlgen-ruby/rbx-gotocodegen.cpp b/ragel/ruby-rbx-gotocodegen.cpp similarity index 99% rename from rlgen-ruby/rbx-gotocodegen.cpp rename to ragel/ruby-rbx-gotocodegen.cpp index 06e6184..6aa42e2 100644 --- a/rlgen-ruby/rbx-gotocodegen.cpp +++ b/ragel/ruby-rbx-gotocodegen.cpp @@ -22,8 +22,8 @@ #include #include -#include "rlgen-ruby.h" -#include "rbx-gotocodegen.h" +#include "ruby-rlgen-ruby.h" +#include "ruby-rbx-gotocodegen.h" #include "redfsm.h" #include "bstmap.h" #include "gendata.h" diff --git a/rlgen-ruby/rbx-gotocodegen.h b/ragel/ruby-rbx-gotocodegen.h similarity index 100% rename from rlgen-ruby/rbx-gotocodegen.h rename to ragel/ruby-rbx-gotocodegen.h diff --git a/rlgen-ruby/rlgen-ruby.h b/ragel/ruby-rlgen-ruby.h similarity index 100% rename from rlgen-ruby/rlgen-ruby.h rename to ragel/ruby-rlgen-ruby.h diff --git a/rlgen-ruby/ruby-tabcodegen.cpp b/ragel/ruby-tabcodegen.cpp similarity index 99% rename from rlgen-ruby/ruby-tabcodegen.cpp rename to ragel/ruby-tabcodegen.cpp index ac7aa87..af50841 100644 --- a/rlgen-ruby/ruby-tabcodegen.cpp +++ b/ragel/ruby-tabcodegen.cpp @@ -24,7 +24,7 @@ #include #include "redfsm.h" #include "gendata.h" -#include "rlgen-ruby.h" +#include "ruby-rlgen-ruby.h" #include "ruby-tabcodegen.h" using std::ostream; diff --git a/rlgen-ruby/ruby-tabcodegen.h b/ragel/ruby-tabcodegen.h similarity index 100% rename from rlgen-ruby/ruby-tabcodegen.h rename to ragel/ruby-tabcodegen.h diff --git a/redfsm/xmlparse.kh b/ragel/xmlparse.kh similarity index 100% rename from redfsm/xmlparse.kh rename to ragel/xmlparse.kh diff --git a/redfsm/xmlparse.kl b/ragel/xmlparse.kl similarity index 100% rename from redfsm/xmlparse.kl rename to ragel/xmlparse.kl diff --git a/redfsm/xmlscan.rl b/ragel/xmlscan.rl similarity index 100% rename from redfsm/xmlscan.rl rename to ragel/xmlscan.rl diff --git a/redfsm/xmltags.gperf b/ragel/xmltags.gperf similarity index 100% rename from redfsm/xmltags.gperf rename to ragel/xmltags.gperf diff --git a/rlgen-cd/Makefile.in b/rlgen-cd/Makefile.in deleted file mode 100644 index e8b6dca..0000000 --- a/rlgen-cd/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright 2001-2006 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../common -I../redfsm -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = main.cpp fsmcodegen.cpp \ - tabcodegen.cpp ftabcodegen.cpp flatcodegen.cpp \ - fflatcodegen.cpp gotocodegen.cpp fgotocodegen.cpp \ - ipgotocodegen.cpp splitcodegen.cpp - -GEN_SRC = xmltags.cpp xmlscan.cpp xmlparse.cpp xmlparse.h - -LIBS = ../common/common.a ../redfsm/redfsm.a - -#************************************* - -prefix = @prefix@ -EXEEXT = @EXEEXT@ -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# Rules. -all: rlgen-cd.a - -rlgen-cd.a: $(LIBS) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile - -clean: - rm -f tags .*.d *.o rlgen-cd.a $(EXTRA_CLEAN) - -install: all - @true - --include $(DEPS) diff --git a/rlgen-csharp/Makefile.in b/rlgen-csharp/Makefile.in deleted file mode 100644 index 454eb3f..0000000 --- a/rlgen-csharp/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright 2001-2006 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../common -I../redfsm -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = main.cpp fsmcodegen.cpp \ - tabcodegen.cpp ftabcodegen.cpp flatcodegen.cpp \ - fflatcodegen.cpp gotocodegen.cpp fgotocodegen.cpp \ - ipgotocodegen.cpp splitcodegen.cpp - -GEN_SRC = xmltags.cpp xmlscan.cpp xmlparse.cpp xmlparse.h - -LIBS = ../common/common.a ../redfsm/redfsm.a - -#************************************* - -prefix = @prefix@ -EXEEXT = @EXEEXT@ -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# Rules. -all: rlgen-csharp.a - -rlgen-csharp.a: $(LIBS) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile - -clean: - rm -f tags .*.d *.o rlgen-csharp.a $(EXTRA_CLEAN) - -install: all - @true - --include $(DEPS) diff --git a/rlgen-dot/Makefile.in b/rlgen-dot/Makefile.in deleted file mode 100644 index c1ea1ac..0000000 --- a/rlgen-dot/Makefile.in +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright 2001-2007 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../common -I../redfsm -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = main.cpp gvdotgen.cpp - -LIBS = ../common/common.a ../redfsm/redfsm.a - - -#************************************* - -prefix = @prefix@ -EXEEXT = @EXEEXT@ -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# Rules. -all: rlgen-dot.a - -rlgen-dot.a: $(LIBS) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile - -clean: - rm -f tags .*.d *.o rlgen-dot $(EXTRA_CLEAN) - -install: all - @true - --include $(DEPS) diff --git a/rlgen-java/Makefile.in b/rlgen-java/Makefile.in deleted file mode 100644 index 15e5880..0000000 --- a/rlgen-java/Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright 2007 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../common -I../redfsm -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = main.cpp javacodegen.cpp - -LIBS = ../common/common.a ../redfsm/redfsm.a - -LIBS += @LIBS@ - -#************************************* - -prefix = @prefix@ -EXEEXT = @EXEEXT@ -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# Rules. -all: rlgen-java.a - -rlgen-java.a: $(LIBS) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile - -clean: - rm -f tags .*.d *.o rlgen-java.a - -install: all - @true - --include $(DEPS) diff --git a/rlgen-ruby/Makefile.in b/rlgen-ruby/Makefile.in deleted file mode 100644 index 99f1fce..0000000 --- a/rlgen-ruby/Makefile.in +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright 2007 Adrian Thurston -# - -# This file is part of Ragel. -# -# Ragel is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Ragel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ragel; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -INCS += -I../common -I../redfsm -I../aapl -DEFS += - -CXXFLAGS += -g -Wall -LDFLAGS += - -CC_SRCS = main.cpp ruby-codegen.cpp ruby-tabcodegen.cpp ruby-ftabcodegen.cpp \ - ruby-flatcodegen.cpp ruby-fflatcodegen.cpp rbx-gotocodegen.cpp - -LIBS = ../common/common.a ../redfsm/redfsm.a - -LIBS += @LIBS@ - -#************************************* - -prefix = @prefix@ -EXEEXT = @EXEEXT@ -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ - -# Get objects and dependencies from sources. -OBJS = $(CC_SRCS:%.cpp=%.o) -DEPS = $(CC_SRCS:%.cpp=.%.d) - -# Get the version info. -include ../version.mk - -# Rules. -all: rlgen-ruby.a - -rlgen-ruby.a: $(LIBS) $(OBJS) - $(AR) -cr $@ $(OBJS) - $(RANLIB) $@ - -%.o: %.cpp - @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d - $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $< - -distclean: clean - rm -f Makefile - -clean: - rm -f tags .*.d *.o rlgen-ruby.a - -install: all - @true - --include $(DEPS) -- 2.7.4