Changeset 3298 for palm/trunk/UTIL/chemistry/gasphase_preproc/kpp

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

Location:

palm/trunk/UTIL/chemistry/gasphase_preproc/kpp

Files:

• bin/kpp (modified) (previous)
• src/lex.yy.c (modified) (23 diffs)

palm/trunk/UTIL/chemistry/gasphase_preproc/kpp/src/lex.yy.c

@@ -10 +10 @@
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
@@ -143 +143 @@
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
@@ -155 +163 @@
 #endif
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t yyleng;
+extern int yyleng;
 
 extern FILE *yyin, *yyout;
@@ -186 +189 @@
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
@@ -203 +211 @@
          * characters.
          */
-        yy_size_t yy_n_chars;
+        int yy_n_chars;
 
         /* Whether we "own" the buffer - i.e., we know we created it,
@@ -273 +281 @@
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;            /* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;          /* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
@@ -302 +310 @@
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
 void *yyalloc (yy_size_t  );
@@ -801 +809 @@
           return (x); \
         }
-#line 804 "lex.yy.c"
+#line 812 "lex.yy.c"
 
 #define INITIAL 0
@@ -864 +872 @@
 void yyset_out  (FILE * out_str  );
 
-yy_size_t yyget_leng (void );
+int yyget_leng (void );
 
 char *yyget_text (void );
@@ -906 +914 @@
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
@@ -1009 +1022 @@
 #line 120 "scan.l"
 
-#line 1012 "lex.yy.c"
+#line 1025 "lex.yy.c"
 
         if ( !(yy_init) )
@@ -1526 +1539 @@
 ECHO;
         YY_BREAK
-#line 1529 "lex.yy.c"
+#line 1542 "lex.yy.c"
 
         case YY_END_OF_BUFFER:
@@ -1710 +1723 @@
         else
                 {
-                        yy_size_t num_to_read =
+                        int num_to_read =
                         YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
@@ -1717 +1730 @@
 
                         /* just a shorter name for the current buffer */
-                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
                         int yy_c_buf_p_offset =
@@ -1724 +1737 @@
                         if ( b->yy_is_our_buffer )
                                 {
-                                yy_size_t new_size = b->yy_buf_size * 2;
+                                int new_size = b->yy_buf_size * 2;
 
                                 if ( new_size <= 0 )
@@ -1755 +1768 @@
                 /* Read in more data. */
                 YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                        (yy_n_chars), num_to_read );
+                        (yy_n_chars), (size_t) num_to_read );
 
                 YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
@@ -1850 +1863 @@
         yy_is_jam = (yy_current_state == 198);
 
-                return yy_is_jam ? 0 : yy_current_state;
+        return yy_is_jam ? 0 : yy_current_state;
 }
 
@@ -1865 +1878 @@
                 { /* need to shift things up to make room */
                 /* +2 for EOB chars. */
-                register yy_size_t number_to_move = (yy_n_chars) + 2;
+                register int number_to_move = (yy_n_chars) + 2;
                 register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
                                         YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
@@ -1914 +1927 @@
                 else
                         { /* need more input */
-                        yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+                        int offset = (yy_c_buf_p) - (yytext_ptr);
                         ++(yy_c_buf_p);
 
@@ -2074 +2087 @@
 }
 
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
@@ -2186 +2203 @@
 static void yyensure_buffer_stack (void)
 {
-        yy_size_t num_to_alloc;
+        int num_to_alloc;
     
         if (!(yy_buffer_stack)) {
@@ -2283 +2300 @@
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
         YY_BUFFER_STATE b;
@@ -2370 +2387 @@
  * 
  */
-yy_size_t yyget_leng  (void)
+int yyget_leng  (void)
 {
         return yyleng;