Diff of /PTOparser/panoScanner.c [7cc5b7] .. [d14593]  Maximize  Restore

Switch to side-by-side view

--- a/PTOparser/panoScanner.c
+++ b/PTOparser/panoScanner.c
@@ -372,8 +372,8 @@
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 38
-#define YY_END_OF_BUFFER 39
+#define YY_NUM_RULES 39
+#define YY_END_OF_BUFFER 40
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -381,22 +381,23 @@
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[129] =
+static yyconst flex_int16_t yy_accept[132] =
     {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,   39,   37,
-        5,    4,   37,   18,    2,   25,   20,   25,   25,   25,
-       25,   25,    5,    1,   37,   12,   11,    8,   10,    7,
-        9,   13,   35,   28,   27,   38,   38,   26,   38,   21,
-       19,   38,    5,    4,    2,    3,   24,    6,   24,    0,
-        5,    1,    0,    0,    0,    0,   35,   34,   32,   33,
-       29,   31,   30,   21,   22,    0,    3,    6,    0,   36,
-        0,    0,    0,   22,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   40,   38,
+        5,    4,   38,   19,    2,   26,   21,   26,   26,   26,
+       26,   26,    5,    1,   38,   13,   12,    9,   26,   11,
+        8,   10,   14,   36,   29,   28,   39,   39,   27,   39,
+       22,   20,   39,    5,    4,    2,    3,   25,    6,   25,
+        0,    5,    1,    0,    0,    0,    0,    0,    7,   36,
+       35,   33,   34,   30,   32,   31,   22,   23,    0,    3,
+        6,    0,   37,    0,    0,    0,   23,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       17,    0,   23,    0,    0,   16,    0,    0,    0,    0,
+        0,    0,    0,   18,    0,   24,    0,    0,   17,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   15,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   14,    0
+        0,    0,    0,    0,    0,    0,    0,   16,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   15,
+        0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -412,9 +413,9 @@
        14,   18,   19,   20,   14,   21,   14,   22,   22,   23,
         1,   24,    1,    1,   25,    1,   26,   27,   28,   29,
 
-       30,   31,   32,   33,   34,   35,   14,   36,   37,   38,
-       39,   40,   14,   41,   42,   43,   44,   45,   14,   46,
-       46,   47,    1,    1,    1,    1,    1,    1,    1,    1,
+       30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
+       40,   41,   14,   42,   43,   44,   45,   46,   14,   47,
+       47,   48,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -431,127 +432,133 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[48] =
+static yyconst flex_int32_t yy_meta[49] =
     {   0,
         1,    1,    2,    1,    2,    1,    1,    1,    3,    3,
         4,    3,    4,    4,    4,    4,    4,    4,    4,    4,
         4,    4,    4,    2,    1,    4,    4,    4,    4,    4,
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4
+        4,    4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[138] =
+static yyconst flex_int16_t yy_base[143] =
     {   0,
-        0,   46,   48,   51,   53,   83,    0,    0,  261,  262,
-       64,  262,  231,  262,   59,  262,  262,   46,    0,   70,
-      188,   75,  103,  262,   80,  262,  262,  262,  262,  262,
-      262,  262,    0,  262,  262,   84,  262,  262,  217,   67,
-      262,  218,  114,  262,  109,  215,  180,   53,  262,  101,
-      126,  262,  220,   60,  189,  177,    0,  262,  262,  262,
-      262,  262,  262,  121,  209,  172,  207,  106,  214,  262,
-      111,  172,  181,  201,  198,  130,  178,  175,  199,  123,
-      173,  168,  181,  131,  164,   56,    0,  132,  198,  196,
-      262,  134,    0,  135,  195,  262,  136,  137,  138,  141,
-
-      139,  146,  140,  142,  144,  143,  145,  147,  148,  149,
-      153,  155,  151,  157,  194,  158,  163,  156,  164,  160,
-      170,  162,  173,  180,  185,  192,  193,  262,  230,  234,
-      236,  240,  244,  248,  252,   67,  256
+        0,   47,   49,   52,   54,   85,    0,    0,  272,  273,
+       65,  273,  260,  273,   60,  273,  273,   47,    0,   72,
+      228,   77,  105,  273,  108,  273,  273,  273,  266,  273,
+      273,  273,  273,    0,  273,  273,   83,  273,  273,  257,
+       68,  273,  258,  116,  273,  118,  255,  219,   54,  273,
+      108,  130,  273,  261,   83,  230,  199,  220,  273,    0,
+      273,  273,  273,  273,  273,  273,  125,  211,  173,  209,
+       80,  216,  273,   92,  173,  185,  205,  202,  110,  179,
+      175,  199,   57,  173,  166,  181,  118,  164,  120,    0,
+      135,  199,  198,  273,  123,    0,  137,  191,  273,  140,
+
+      141,  145,  146,  143,  144,  147,  150,  148,  153,  149,
+      151,  157,  155,  158,  162,  160,  163,  185,  159,  152,
+      164,  165,  167,  170,  168,  171,  172,  184,  173,   69,
+      273,  224,  228,  230,  234,  238,  242,  246,  250,  254,
+       60,  258
     } ;
 
-static yyconst flex_int16_t yy_def[138] =
+static yyconst flex_int16_t yy_def[143] =
     {   0,
-      128,    1,  129,  129,  130,  130,  130,  130,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  131,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  132,  128,  128,  133,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  131,  128,  128,
-      128,  128,  134,  134,  128,  128,  132,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  134,  128,
-      134,  128,  128,  128,  128,  134,  128,  128,  128,  134,
-      128,  128,  128,  134,  128,  135,  136,  134,  137,  135,
-      128,  135,  136,  134,  137,  128,  135,  134,  135,  134,
-
-      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-      135,  134,  135,  134,  135,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,    0,  128,  128,
-      128,  128,  128,  128,  128,  128,  128
+      131,    1,  132,  132,  133,  133,  133,  133,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  134,  131,
+      131,  131,  131,  131,  135,  131,  131,  131,  136,  131,
+      131,  131,  131,  137,  131,  131,  138,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  134,  131,
+      131,  131,  131,  139,  139,  131,  131,  136,  131,  137,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  139,  131,  139,  131,  131,  131,  131,  139,  131,
+      131,  131,  139,  131,  131,  131,  139,  131,  140,  141,
+      139,  142,  140,  131,  140,  141,  139,  142,  131,  140,
+
+      139,  140,  139,  140,  139,  140,  139,  140,  139,  140,
+      139,  140,  139,  140,  139,  140,  139,  140,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
+        0,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131
     } ;
 
-static yyconst flex_int16_t yy_nxt[310] =
+static yyconst flex_int16_t yy_nxt[322] =
     {   0,
        10,   11,   12,   11,   10,   10,   13,   14,   13,   10,
        15,   10,   16,   16,   17,   18,   19,   20,   17,   21,
        22,   16,   16,   10,   10,   16,   16,   16,   16,   16,
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   16,   23,   24,   23,
-       34,   25,   35,   34,   68,   35,   68,   38,   91,   39,
-       26,   39,   70,   40,   41,   43,   44,   43,   46,   45,
-       93,   36,   47,   27,   36,   47,   65,   64,   42,   28,
-       92,   53,   29,   54,   30,   31,   47,   38,   55,   39,
-       32,   39,   71,   40,   41,   49,   49,   49,   49,   49,
-
-       49,   49,   49,   49,   51,   52,   51,   68,   42,   68,
-       59,   49,   56,   70,   60,   43,   44,   43,   46,   45,
-       49,   61,   49,   49,   62,   70,   63,   51,   52,   51,
-       65,   64,   70,   70,   70,   94,   91,   70,   91,   70,
-       91,   91,   91,   70,   70,   70,   91,   91,   70,   70,
-       91,   70,  112,   91,   76,   91,   84,   70,   70,   70,
-       70,   80,   70,  119,   70,   70,   70,  120,   88,  105,
-      108,  106,   70,   97,   98,   70,  101,  100,   99,  102,
-      104,  111,   70,  103,  107,  114,  109,   70,  115,  110,
-      116,  113,  118,  117,   70,   70,   91,   96,   91,  122,
-
-       96,   89,  123,   87,  121,   86,   85,   83,   82,   81,
-       79,   74,   78,  125,  124,   77,   70,   67,   75,   74,
-       73,   72,   70,  126,   49,   67,   66,   64,   50,  127,
-       33,   33,   33,   33,   37,   37,   37,   37,   48,   48,
-       57,   45,   57,   57,   58,   58,   58,   58,   69,   69,
-       69,   69,   90,   90,   90,   90,   95,   95,   95,   95,
-      128,    9,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-
-      128,  128,  128,  128,  128,  128,  128,  128,  128
+       16,   16,   16,   16,   16,   16,   16,   16,   23,   24,
+       23,   35,   25,   36,   35,   71,   36,   71,   39,   73,
+       40,   26,   40,   96,   41,   42,   44,   45,   44,   47,
+       46,   73,   37,   48,   27,   37,   48,   68,   67,   43,
+       28,   71,   29,   71,   30,   73,   31,   32,   48,   39,
+       87,   40,   33,   40,   73,   41,   42,   50,   50,   50,
+
+       50,   50,   50,   50,   50,   50,   52,   53,   52,   62,
+       43,   55,   73,   63,   50,   74,   56,   44,   45,   44,
+       73,   64,   94,   50,   65,   94,   66,   47,   46,   50,
+       50,   52,   53,   52,   68,   67,   79,   73,   97,   73,
+       57,   83,   94,   73,   95,   94,   73,   94,   73,   94,
+       94,   94,   73,   73,   73,   73,   91,   73,  115,   94,
+       94,   73,   94,  100,   73,   73,   73,   73,  123,   73,
+       73,  122,   73,   73,   73,   73,  108,  101,  107,  109,
+      111,  121,  103,  102,  104,  105,   73,   94,  106,  110,
+      114,  112,  117,   99,  113,  120,  119,  116,  118,  125,
+
+       94,   99,   92,   90,   89,  128,   88,   86,   85,  126,
+       84,  130,  124,  127,   82,   77,   81,   80,   73,   70,
+       78,   77,   59,  129,   34,   34,   34,   34,   38,   38,
+       38,   38,   49,   49,   54,   54,   54,   54,   58,   58,
+       58,   58,   60,   76,   60,   60,   61,   61,   61,   61,
+       72,   72,   72,   72,   93,   93,   93,   93,   98,   98,
+       98,   98,   75,   73,   50,   70,   69,   67,   59,   51,
+       46,  131,    9,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131
     } ;
 
-static yyconst flex_int16_t yy_chk[310] =
+static yyconst flex_int16_t yy_chk[322] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    2,    2,    2,
-        3,    2,    3,    4,   48,    4,   48,    5,   86,    5,
-        2,    5,   54,    5,    5,   11,   11,   11,   15,   15,
-      136,    3,   18,    2,    4,   18,   40,   40,    5,    2,
-       86,   25,    2,   25,    2,    2,   18,    6,   25,    6,
-        2,    6,   54,    6,    6,   20,   20,   20,   20,   20,
-
-       22,   22,   22,   22,   23,   23,   23,   68,    6,   68,
-       36,   22,   25,   71,   36,   43,   43,   43,   45,   45,
-       22,   36,   50,   50,   36,   80,   36,   51,   51,   51,
-       64,   64,   76,   84,   88,   88,   92,   94,   97,   98,
-       99,  101,  103,  100,  104,  106,  105,  107,  102,  108,
-      109,  110,  110,  113,   71,  111,   80,  112,  118,  114,
-      116,   76,  120,  118,  122,  117,  119,  119,   84,  103,
-      106,  104,  121,   92,   94,  123,   99,   98,   97,  100,
-      102,  109,  124,  101,  105,  112,  107,  125,  113,  108,
-      114,  111,  117,  116,  126,  127,  115,   95,   90,  121,
-
-       89,   85,  122,   83,  120,   82,   81,   79,   78,   77,
-       75,   74,   73,  124,  123,   72,   69,   67,   66,   65,
-       56,   55,   53,  125,   47,   46,   42,   39,   21,  126,
-      129,  129,  129,  129,  130,  130,  130,  130,  131,  131,
-      132,   13,  132,  132,  133,  133,  133,  133,  134,  134,
-      134,  134,  135,  135,  135,  135,  137,  137,  137,  137,
-        9,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-
-      128,  128,  128,  128,  128,  128,  128,  128,  128
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    2,
+        2,    3,    2,    3,    4,   49,    4,   49,    5,   83,
+        5,    2,    5,  141,    5,    5,   11,   11,   11,   15,
+       15,  130,    3,   18,    2,    4,   18,   41,   41,    5,
+        2,   71,    2,   71,    2,   55,    2,    2,   18,    6,
+       83,    6,    2,    6,   74,    6,    6,   20,   20,   20,
+
+       20,   20,   22,   22,   22,   22,   23,   23,   23,   37,
+        6,   25,   79,   37,   22,   55,   25,   44,   44,   44,
+       87,   37,   89,   22,   37,   95,   37,   46,   46,   51,
+       51,   52,   52,   52,   67,   67,   74,   91,   91,   97,
+       25,   79,  100,  101,   89,  104,  105,  102,  103,  106,
+      108,  110,  107,  111,  120,  109,   87,  113,  113,  112,
+      114,  119,  116,   95,  115,  117,  121,  122,  122,  123,
+      125,  121,  124,  126,  127,  129,  106,   97,  105,  107,
+      109,  120,  101,  100,  102,  103,  128,  118,  104,  108,
+      112,  110,  115,   98,  111,  119,  117,  114,  116,  124,
+
+       93,   92,   88,   86,   85,  127,   84,   82,   81,  125,
+       80,  129,  123,  126,   78,   77,   76,   75,   72,   70,
+       69,   68,   58,  128,  132,  132,  132,  132,  133,  133,
+      133,  133,  134,  134,  135,  135,  135,  135,  136,  136,
+      136,  136,  137,   57,  137,  137,  138,  138,  138,  138,
+      139,  139,  139,  139,  140,  140,  140,  140,  142,  142,
+      142,  142,   56,   54,   48,   47,   43,   40,   29,   21,
+       13,    9,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      131
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -621,7 +628,7 @@
 
 
 
-#line 625 "panoScanner.c"
+#line 632 "panoScanner.c"
 
 #define INITIAL 0
 #define str 1
@@ -819,7 +826,7 @@
 
   /* Simple rules for all purpose */
 
-#line 823 "panoScanner.c"
+#line 830 "panoScanner.c"
 
 	if ( !(yy_init) )
 		{
@@ -873,13 +880,13 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 129 )
+				if ( yy_current_state >= 132 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 262 );
+		while ( yy_base[yy_current_state] != 273 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -961,132 +968,138 @@
                return PT_TOKEN_SEP;
             }
 	YY_BREAK
-/* Hugin specific variables. When they are supported it would
-  be easier to generate a new type of token for them. For the
-  time being just ignore them */
+/* Things we are currently ignoring */
 case 6:
 YY_RULE_SETUP
-#line 112 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
-{  /* ignore K parameters */
+#line 110 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+{  
                panoScriptScannerTokenBegin(yytext);
              }
 	YY_BREAK
+case 7:
+/* rule 7 can match eol */
+YY_RULE_SETUP
+#line 114 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+{  
+               panoScriptScannerTokenBegin(yytext);
+             }
+	YY_BREAK
 /****************************************/
 /* These are the types of lines supported */
-case 7:
-YY_RULE_SETUP
-#line 120 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 8:
+YY_RULE_SETUP
+#line 123 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {   /* Output line */ 
                 panoScriptScannerTokenBegin(yytext); 
                 return PT_TOKEN_OUTPUT_LINE;
              }
 	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 125 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 9:
+YY_RULE_SETUP
+#line 128 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {  /* input line */
                 panoScriptScannerTokenBegin(yytext); 
                 return PT_TOKEN_INPUT_LINE;
              }
 	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 130 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 10:
+YY_RULE_SETUP
+#line 133 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {  /* panorama line */
                 panoScriptScannerTokenBegin(yytext); 
                 return PT_TOKEN_PANO_LINE;
              }
 	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 135 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 11:
+YY_RULE_SETUP
+#line 138 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {  /* Optimization options line */
                 panoScriptScannerTokenBegin(yytext); 
                 return PT_TOKEN_OPTIMIZE_OPT_LINE;
              }
 	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 140 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 12:
+YY_RULE_SETUP
+#line 143 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
              panoScriptScannerTokenBegin(yytext); 
              return PT_TOKEN_CONTROL_PT_LINE;
              }
 	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 145 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 13:
+YY_RULE_SETUP
+#line 148 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
              panoScriptScannerTokenBegin(yytext); 
              return PT_TOKEN_MORPH_PT_LINE;
              }
 	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 150 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 14:
+YY_RULE_SETUP
+#line 153 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {  
                panoScriptScannerTokenBegin(yytext); 
                return PT_TOKEN_OPTIMIZE_VARS_LINE;
 
             } 
 	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 157 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 15:
+YY_RULE_SETUP
+#line 160 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* hugin header file for PTO files */
               DEBUG_1("In PTo version line\n");
               panoScriptScannerTokenBegin(yytext); 
               return PT_TOKEN_HUGIN_VERSION;
             }
 	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 163 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 16:
+YY_RULE_SETUP
+#line 166 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* hugin header file for PTO files */
               DEBUG_1("In PTo version line\n");
              panoScriptScannerTokenBegin(yytext); 
               return PT_TOKEN_HUGIN_VERSION;
             }
 	YY_BREAK
-case 16:
-/* rule 16 can match eol */
-YY_RULE_SETUP
-#line 169 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+#line 172 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* hugin options*/
               DEBUG_1("Ignored hugin options\n");
             }
 	YY_BREAK
-case 17:
-/* rule 17 can match eol */
-YY_RULE_SETUP
-#line 173 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 18:
+/* rule 18 can match eol */
+YY_RULE_SETUP
+#line 176 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* hugin options*/
               DEBUG_1("Ignored hugin options\n");
             }
 	YY_BREAK
 /********************************/
 /* Main tokens in different libpano lines */
-case 18:
-YY_RULE_SETUP
-#line 180 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 19:
+YY_RULE_SETUP
+#line 183 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { 
               panoScriptScannerTokenBegin(yytext); 
               BEGIN(parm);
               return PT_TOKEN_COMMA;  
               }
 	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 186 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 20:
+YY_RULE_SETUP
+#line 189 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {  /* Reference to a variable */
 
               panoScriptScannerTokenBegin(yytext); 
               return PT_TOKEN_REFERENCE;  
               }
 	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 193 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 21:
+YY_RULE_SETUP
+#line 196 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
              /* These are the C and S parameters that contain multiple values */
                strncpy(yylval.strVal, yytext, PT_TOKEN_MAX_LEN);
@@ -1094,9 +1107,9 @@
                return PT_TOKEN_KEYWORD_CROPPING;
             } 
 	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 201 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 22:
+YY_RULE_SETUP
+#line 204 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* Simple integer */
                 DEBUG_3( "An integer: %s (%d)\n", yytext, atoi( yytext ) );
                 /* move back to default mode */
@@ -1106,9 +1119,9 @@
                 return PT_TOKEN_NUMBER;
                }
 	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 210 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 23:
+YY_RULE_SETUP
+#line 213 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* a float */
                 DEBUG_3( "An float: %s (%f)\n", yytext, atof( yytext ) );
                 /* move back to default mode */
@@ -1118,9 +1131,9 @@
                 return PT_TOKEN_NUMBER;
                }
 	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 221 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 24:
+YY_RULE_SETUP
+#line 224 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                   /* Read the rest of the parameter as a string by default */
                    /* move back to default mode */
@@ -1132,9 +1145,9 @@
                 }
 	YY_BREAK
 /* Some variables now have are now more than 1 char long */
-case 24:
-YY_RULE_SETUP
-#line 234 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 25:
+YY_RULE_SETUP
+#line 237 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                   panoScriptScannerTokenBegin(yytext); 
                   strncpy(yylval.strVal, yytext, PT_TOKEN_MAX_LEN);
@@ -1143,9 +1156,9 @@
             }
 	YY_BREAK
 /* The default is only one character */
-case 25:
-YY_RULE_SETUP
-#line 244 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 26:
+YY_RULE_SETUP
+#line 247 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                 DEBUG_2( "An identifier for a variable: %s\n", yytext );
                 /* move into parameter mode */
@@ -1157,9 +1170,9 @@
 	YY_BREAK
 /********************************/
 /* From this on process strings */
-case 26:
-YY_RULE_SETUP
-#line 256 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 27:
+YY_RULE_SETUP
+#line 259 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* Begin of string */
                  panoScriptScannerTokenBegin(yytext); 
                  strBuffer_ptr = strBuffer; 
@@ -1167,9 +1180,9 @@
                  //printf("Beginning of string\n");
                }
 	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 263 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 28:
+YY_RULE_SETUP
+#line 266 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { /* saw closing quote - all done */
                    BEGIN(INITIAL);
                    *strBuffer_ptr = '\0';
@@ -1181,10 +1194,10 @@
                    return PT_TOKEN_STRING;
                 }
 	YY_BREAK
-case 28:
-/* rule 28 can match eol */
-YY_RULE_SETUP
-#line 274 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 29:
+/* rule 29 can match eol */
+YY_RULE_SETUP
+#line 277 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                  /* error - unterminated string constant */
                  /* generate error message */
@@ -1192,40 +1205,40 @@
                  return -0;
                }
 	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 281 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 30:
+YY_RULE_SETUP
+#line 284 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = '\n';
 	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 282 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 31:
+YY_RULE_SETUP
+#line 285 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = '\t';
 	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 283 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 32:
+YY_RULE_SETUP
+#line 286 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = '\r';
 	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 284 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 33:
+YY_RULE_SETUP
+#line 287 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = '\b';
 	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 285 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 34:
+YY_RULE_SETUP
+#line 288 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = '\f';
 	YY_BREAK
-case 34:
-/* rule 34 can match eol */
-YY_RULE_SETUP
-#line 287 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 35:
+/* rule 35 can match eol */
+YY_RULE_SETUP
+#line 290 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 *strBuffer_ptr++ = yytext[1];
 	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 289 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 36:
+YY_RULE_SETUP
+#line 292 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                      int currentLen = strlen(strBuffer);
                      char *yptr = yytext;
@@ -1234,31 +1247,31 @@
                      panoScriptScannerTokenBegin(yytext); 
                    }
 	YY_BREAK
-/* Ignore comments */
-case 36:
-/* rule 36 can match eol */
-YY_RULE_SETUP
-#line 299 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+/* Ignore comments. If the line starts with #h or #- then it is a hugin-option line... ugly */
+case 37:
+/* rule 37 can match eol */
+YY_RULE_SETUP
+#line 302 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 {
                   DEBUG_1("Comment\n");
                 }
 	YY_BREAK
 /********************************/
 /* Catch errors */
-case 37:
-YY_RULE_SETUP
-#line 308 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 38:
+YY_RULE_SETUP
+#line 311 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 { 
                panoScriptParserError(1,"Unrecognized character: [%s]\n", yytext );
                return PT_TOKEN_ERROR;
             }
 	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 315 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+case 39:
+YY_RULE_SETUP
+#line 318 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
 ECHO;
 	YY_BREAK
-#line 1262 "panoScanner.c"
+#line 1275 "panoScanner.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1549,7 +1562,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 129 )
+			if ( yy_current_state >= 132 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1577,11 +1590,11 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 129 )
+		if ( yy_current_state >= 132 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 128);
+	yy_is_jam = (yy_current_state == 131);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2257,8 +2270,8 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 315 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
-
-
-
-
+#line 318 "/home/dmg/hg.w/libpanorama/PTOparser/panoScanner.l"
+
+
+
+

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks