Merge remote-tracking branch 'antage/golang-6' into ragel-6

2 files changed, 15 insertions, 14 deletions

diff --git a/doc/ragel-guide.tex b/doc/ragel-guide.tex
index a68043f7..fab8a518 100644
--- a/doc/ragel-guide.tex
+++ b/doc/ragel-guide.tex
@@ -2641,7 +2641,8 @@ Go:
           int8      uint8
           int16     uint16
           int32     uint32
-          int
+          int64     uint64
+          rune
 \end{verbatim}
 
 Ruby: 
@@ -3084,17 +3085,17 @@ preferred output format.
 \hline
 \multicolumn{3}{|c|}{\bf Code Output Style Options} \\
 \hline
-\verb|-T0|&binary search table-driven&C/D/Java/Ruby/C\#\\
+\verb|-T0|&binary search table-driven&C/D/Java/Ruby/C\#/Go\\
 \hline
-\verb|-T1|&binary search, expanded actions&C/D/Ruby/C\#\\
+\verb|-T1|&binary search, expanded actions&C/D/Ruby/C\#/Go\\
 \hline
-\verb|-F0|&flat table-driven&C/D/Ruby/C\#\\
+\verb|-F0|&flat table-driven&C/D/Ruby/C\#/Go\\
 \hline
-\verb|-F1|&flat table, expanded actions&C/D/Ruby/C\#\\
+\verb|-F1|&flat table, expanded actions&C/D/Ruby/C\#/Go\\
 \hline
-\verb|-G0|&goto-driven&C/D/C\#\\
+\verb|-G0|&goto-driven&C/D/C\#/Go\\
 \hline
-\verb|-G1|&goto, expanded actions&C/D/C\#\\
+\verb|-G1|&goto, expanded actions&C/D/C\#/Go\\
 \hline
 \verb|-G2|&goto, in-place actions&C/D/Go\\
 \hline
diff --git a/doc/ragel.1.in b/doc/ragel.1.in
index bac04db1..ca58f6e0 100644
--- a/doc/ragel.1.in
+++ b/doc/ragel.1.in
@@ -119,7 +119,7 @@ The host language is D.
 The host language is Java.
 .TP
 .B \-Z
-The host language is Go.  Must be used with -G2 option.
+The host language is Go.
 .TP
 .B \-R
 The host language is Ruby.
@@ -128,7 +128,7 @@ The host language is Ruby.
 Inhibit writing of #line directives.
 .TP
 .B \-T0
-(C/D/Java/Ruby/C#) Generate a table driven FSM. This is the default code style.
+(C/D/Java/Ruby/C#/Go) Generate a table driven FSM. This is the default code style.
 The table driven
 FSM represents the state machine as static data. There are tables of states,
 transitions, indicies and actions. The current state is stored in a variable.
@@ -140,21 +140,21 @@ compile but results in slower running code. The table driven FSM is suitable
 for any FSM.
 .TP
 .B \-T1
-(C/D/Ruby/C#) Generate a faster table driven FSM by expanding action lists in the action
+(C/D/Ruby/C#/Go) Generate a faster table driven FSM by expanding action lists in the action
 execute code.
 .TP
 .B \-F0
-(C/D/Ruby/C#) Generate a flat table driven FSM. Transitions are represented as an array
+(C/D/Ruby/C#/Go) Generate a flat table driven FSM. Transitions are represented as an array
 indexed by the current alphabet character. This eliminates the need for a
 binary search to locate transitions and produces faster code, however it is
 only suitable for small alphabets.
 .TP
 .B \-F1
-(C/D/Ruby/C#) Generate a faster flat table driven FSM by expanding action lists in the action
+(C/D/Ruby/C#/Go) Generate a faster flat table driven FSM by expanding action lists in the action
 execute code.
 .TP
 .B \-G0
-(C/D/C#) Generate a goto driven FSM. The goto driven FSM represents the state machine
+(C/D/C#/Go) Generate a goto driven FSM. The goto driven FSM represents the state machine
 as a series of goto statements. While in the machine, the current state is
 stored by the processor's instruction pointer. The execution is a flat function
 where control is passed from state to state using gotos. In general, the goto
@@ -162,7 +162,7 @@ FSM produces faster code but results in a larger binary and a more expensive
 host language compile.
 .TP
 .B \-G1
-(C/D/C#) Generate a faster goto driven FSM by expanding action lists in the action
+(C/D/C#/Go) Generate a faster goto driven FSM by expanding action lists in the action
 execute code.
 .TP
 .B \-G2