ragel-6.10HEADragel-6.10master

4 files changed, 39 insertions, 19 deletions

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 957d7e7..1eae6df 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,17 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -101,12 +111,11 @@ noinst_PROGRAMS = atoi$(EXEEXT) awkemu$(EXEEXT) clang$(EXEEXT) \
 	gotocallret$(EXEEXT) mailbox$(EXEEXT) params$(EXEEXT) \
 	pullscan$(EXEEXT) rlscan$(EXEEXT) statechart$(EXEEXT)
 subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/ragel/config.h
 CONFIG_CLEAN_FILES =
@@ -221,6 +230,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -316,6 +326,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -358,7 +369,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign examples/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -675,6 +685,8 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 gotocallret.cpp: gotocallret.rl
 	$(RAGEL) -G2 -o gotocallret.cpp gotocallret.rl 
diff --git a/examples/gotocallret.cpp b/examples/gotocallret.cpp
index 18a9531..888110f 100644
--- a/examples/gotocallret.cpp
+++ b/examples/gotocallret.cpp
@@ -138,9 +138,9 @@ tr1:
 #line 42 "gotocallret.rl"
 	{
 		if ( comm >= 'a' )
-			{stack[top++] = 2; goto st5;}
+			{stack[top++] = 2;goto st5;}
 		else 
-			{stack[top++] = 2; goto st6;}
+			{stack[top++] = 2;goto st6;}
 	}
 	goto st2;
 st2:
@@ -238,18 +238,24 @@ case 10:
 	switch ( cs ) {
 	case 5: 
 #line 38 "gotocallret.rl"
-	{p--;{cs = stack[--top];goto _again;}}
+	{p--;{cs = stack[--top];	if ( p == pe )
+		goto _test_eof;
+goto _again;}}
 	break;
 	case 6: 
 #line 39 "gotocallret.rl"
-	{p--;{cs = stack[--top];goto _again;}}
+	{p--;{cs = stack[--top];	if ( p == pe )
+		goto _test_eof;
+goto _again;}}
 	break;
 	case 1: 
 	case 2: 
 #line 56 "gotocallret.rl"
-	{p--;{goto st3;}}
+	{p--;{       if ( p == pe )
+               goto _test_eof3;
+goto st3;}}
 	break;
-#line 253 "gotocallret.cpp"
+#line 259 "gotocallret.cpp"
 	}
 	}
 
diff --git a/examples/mailbox.cpp b/examples/mailbox.cpp
index 7e9c46e..40f8b55 100644
--- a/examples/mailbox.cpp
+++ b/examples/mailbox.cpp
@@ -588,11 +588,11 @@ tr88:
 			 * the contents. */
 			cout << headName.data << ":";
 			headName.clear();
-			{stack[top++] = 34; goto st103;}
+			{stack[top++] = 34;goto st103;}
 		}
 
 		headName.clear();
-		{stack[top++] = 34; goto st102;}
+		{stack[top++] = 34;goto st102;}
 	}
 	goto st34;
 st34:
@@ -1496,10 +1496,12 @@ case 104:
 		cout << headContent.data << endl;
 		headContent.clear();
 		p--;
-		{cs = stack[--top];goto _again;}
+		{cs = stack[--top];	if ( p == pe )
+		goto _test_eof;
+goto _again;}
 	}
 	break;
-#line 1503 "mailbox.cpp"
+#line 1505 "mailbox.cpp"
 	}
 	}
 
diff --git a/examples/rlscan.cpp b/examples/rlscan.cpp
index 1c428f8..7e92211 100644
--- a/examples/rlscan.cpp
+++ b/examples/rlscan.cpp
@@ -252,7 +252,7 @@ tr50:
 #line 211 "rlscan.rl"
 	{te = p+1;{
 			escapeXML( ts, te-ts );
-			{stack[top++] = 24; goto st6;}
+			{stack[top++] = 24;goto st6;}
 		}}
 	goto st24;
 st24:
@@ -462,7 +462,7 @@ tr58:
 #line 91 "rlscan.rl"
 	{te = p+1;{
 			write( "/*" );
-			{stack[top++] = 31; goto st6;}
+			{stack[top++] = 31;goto st6;}
 		}}
 	goto st31;
 st31: