- updated rail diagram

Author: rkaminsk

guide.ind

@@ -2,17 +2,17 @@
 
   \item Aggregates, \hyperpage{26}
     \subitem Assignments, \hyperpage{29}
-      \subsubitem Domain Predicates, \hyperpage{29}
-    \subitem Average, \code{\#avg}, \hyperpage{91}
-    \subitem Body, \hyperpage{26}
+      \subsubitem Domain Predicates, \hyperpage{30}
+    \subitem Average, \code{\#avg}, \hyperpage{92}
+    \subitem Body, \hyperpage{27}
     \subitem Conditions, \hyperpage{24}
       \subsubitem Domain Predicates, \hyperpage{26}
-    \subitem Count, \code{\#count}, \hyperpage{26}
+    \subitem Count, \code{\#count}, \hyperpage{27}
     \subitem Head, \hyperpage{28}
-    \subitem Maximum, \code{\#max}, \hyperpage{26}
-    \subitem Minimum, \code{\#min}, \hyperpage{26}
-    \subitem Sum plus, \code{\#sum+}, \hyperpage{26}
-    \subitem Sum, \code{\#sum}, \hyperpage{26}
+    \subitem Maximum, \code{\#max}, \hyperpage{27}
+    \subitem Minimum, \code{\#min}, \hyperpage{27}
+    \subitem Sum plus, \code{\#sum+}, \hyperpage{27}
+    \subitem Sum, \code{\#sum}, \hyperpage{27}
     \subitem Weights, \hyperpage{26}
   \item Arithmetic Functions, \hyperpage{20}
     \subitem Absolute Value, \mbox{\textbar$\cdot$\textbar}, 
@@ -29,14 +29,14 @@
     \subitem Multiplication, \code{*}, \hyperpage{20}
     \subitem Subtraction, \code{-}, \hyperpage{20}
     \subitem Unary Minus, \code{-}, \hyperpage{20}
-  \item Assignments, \hyperpage{21}
+  \item Assignments, \hyperpage{22}
     \subitem Aggregates, \hyperpage{29}
-      \subsubitem Domain Predicates, \hyperpage{29}
-    \subitem Variable Assignment, \code{=}, \hyperpage{21}
+      \subsubitem Domain Predicates, \hyperpage{30}
+    \subitem Variable Assignment, \code{=}, \hyperpage{22}
 
   \indexspace
 
-  \item Boolean Constants, \hyperpage{19}
+  \item Boolean Constants, \hyperpage{20}
 
   \indexspace
 
@@ -51,41 +51,41 @@
   \indexspace
 
   \item External Functions, \hyperpage{35}
-    \subitem Calling, \hyperpage{35}
-    \subitem Term Insertion, \hyperpage{36}
+    \subitem Calling, \hyperpage{36}
+    \subitem Term Insertion, \hyperpage{37}
 
   \indexspace
 
   \item Logic Programs, \hyperpage{15}, \hyperpage{18}
     \subitem Atoms, \hyperpage{15}
       \subsubitem Aggregates, \hyperpage{26}
-      \subsubitem Assignments, \hyperpage{21}
-      \subsubitem Boolean Constants, \hyperpage{19}
+      \subsubitem Assignments, \hyperpage{22}
+      \subsubitem Boolean Constants, \hyperpage{20}
       \subsubitem Comparison Predicates, \hyperpage{21}
-      \subsubitem Pooling, \code{;}, \hyperpage{23}
+      \subsubitem Pooling, \code{;}, \hyperpage{24}
     \subitem Disjunction, \hyperpage{18}
     \subitem Facts, \hyperpage{15}
       \subsubitem Disjunctive, \hyperpage{18}
     \subitem Integrity Constraints, \hyperpage{15}
     \subitem Literals, \hyperpage{15}
-      \subsubitem Classical Negation, \hyperpage{17}
+      \subsubitem Classical Negation, \hyperpage{18}
       \subsubitem Conditions, \hyperpage{24}
       \subsubitem Default Negation, \hyperpage{15}
       \subsubitem Domain Predicates, \hyperpage{26}
       \subsubitem Double Default Negation, \hyperpage{19}
       \subsubitem Head, \hyperpage{19}
     \subitem Rules, \hyperpage{15}
       \subsubitem Disjunctive, \hyperpage{18}
-    \subitem Safety, \hyperpage{17}, \hyperpage{20--23}, \hyperpage{30}, 
-		\hyperpage{33}, \hyperpage{40, 41}
+    \subitem Safety, \hyperpage{17}, \hyperpage{21--24}, \hyperpage{30}, 
+		\hyperpage{34}, \hyperpage{40, 41}
   \item Lua, \hyperpage{35}
 
   \indexspace
 
-  \item Meta-Statements, \hyperpage{38}
-    \subitem Comments, \hyperpage{38}
+  \item Meta-Statements, \hyperpage{39}
+    \subitem Comments, \hyperpage{39}
     \subitem Const Statements, \code{\#const}, \hyperpage{40}
-    \subitem External Statements, \code{\#external}, \hyperpage{40}
+    \subitem External Statements, \code{\#external}, \hyperpage{41}
     \subitem Program Parts, \code{\#program}, \hyperpage{41}
     \subitem Show Statements, \code{\#show}, \hyperpage{39}
 
@@ -109,11 +109,11 @@
     \subitem External Functions, \hyperpage{35}
     \subitem Functions, \hyperpage{13}
     \subitem Integers, \hyperpage{20}
-    \subitem Intervals, \hyperpage{22}
-    \subitem Pooling, \code{;}, \hyperpage{23}
+    \subitem Intervals, \hyperpage{23}
+    \subitem Pooling, \code{;}, \hyperpage{24}
     \subitem Strings, \hyperpage{13}
     \subitem Variables, \hyperpage{13}
       \subsubitem Anonymous, \hyperpage{13}
-      \subsubitem Assignments, \hyperpage{21}
+      \subsubitem Assignments, \hyperpage{22}
 
 \end{theindex}

guide.rao

@@ -4,7 +4,7 @@
 \rail@t {any}
 \rail@t {bs}
 \rail@t {esc}
-\rail@i {1}{ term : simpleterm | function | tuple; simpleterm : (integer | constant | string | variable | rusc | '\#sup' | '\#inf'); constant : (rusc*) '[a-z]' (rlsc*); string : '"' ((any | (bs esc))*) '"'; variable : (rusc*) '[A-Z]' (rlsc*); function : constant '(' term (',' term*) ')'; tuple : '(' term (',' term*) ')'; }
+\rail@i {1}{ term : simpleterm | function | tuple; simpleterm : (integer | constant | string | variable | rusc | '\#sup' | '\#inf'); constant : (rusc*) '[a-z]' (rlsc*); string : '"' ((any | (bs esc))*) '"'; variable : (rusc*) '[A-Z]' (rlsc*); function : constant '(' term (',' term*) ')'; tuple : '(' (term (',' | ',' term+))? ')'; }
 \rail@o {1}{
 \rail@begin{3}{term}
 \rail@bar
@@ -96,17 +96,21 @@
 \rail@endbar
 \rail@term{)}[]
 \rail@end
-\rail@begin{3}{tuple}
+\rail@begin{4}{tuple}
 \rail@term{(}[]
-\rail@nont{term}[]
 \rail@bar
 \rail@nextbar{1}
+\rail@nont{term}[]
+\rail@bar
+\rail@term{,}[]
+\rail@nextbar{2}
 \rail@plus
 \rail@term{,}[]
 \rail@nont{term}[]
-\rail@nextplus{2}
+\rail@nextplus{3}
 \rail@endplus
 \rail@endbar
+\rail@endbar
 \rail@term{)}[]
 \rail@end
 }

language.tex

@@ -38,7 +38,6 @@ \subsubsection{Normal Programs and Integrity Constraints}\label{subsec:gringo:no
 
 \comment{T2R: Upgrade tuple definition}
 \begin{figure}
-\vspace*{-19mm}
 \railnontermfont{\rmfamily\itshape}%
 \railalias{rusc}{\tt\char95}\railterm{rusc}
 \railalias{rlsc}{[A-Za-z0-9\tt\char95']}\railterm{rlsc}
@@ -52,7 +51,7 @@ \subsubsection{Normal Programs and Integrity Constraints}\label{subsec:gringo:no
   string      : '"' ((any | (bs esc))*) '"';
   variable    : (rusc*) '[A-Z]' (rlsc*);
   function    : constant '(' term (',' term*) ')';
-  tuple       :          '(' term (',' term*) ')';
+  tuple       :          '(' (term (',' | ',' term+))? ')';
 \end{rail}
 \caption{Grammar for Terms.\label{fig:terms}}
 \end{figure}