texlive[68826] Build/source/texk/web2c/hitexdir: replacing
commits+mruckert at tug.org
commits+mruckert at tug.org
Mon Nov 13 11:37:39 CET 2023
Revision: 68826
https://tug.org/svn/texlive?view=revision&revision=68826
Author: mruckert
Date: 2023-11-13 11:37:38 +0100 (Mon, 13 Nov 2023)
Log Message:
-----------
replacing \HINTsubversion by \HINTminorversion
synchonizing output_directory with TEXMF_OUTPUT_DIRECTORY
Modified Paths:
--------------
trunk/Build/source/texk/web2c/hitexdir/doc/hiformat.hnt
trunk/Build/source/texk/web2c/hitexdir/doc/hiformat.pdf
trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.hnt
trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.pdf
trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.tex
trunk/Build/source/texk/web2c/hitexdir/hiformat.w
trunk/Build/source/texk/web2c/hitexdir/hilexer.c
trunk/Build/source/texk/web2c/hitexdir/hitex.w
Modified: trunk/Build/source/texk/web2c/hitexdir/doc/hiformat.hnt
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/web2c/hitexdir/doc/hiformat.pdf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.hnt
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.pdf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.tex
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.tex 2023-11-13 00:43:48 UTC (rev 68825)
+++ trunk/Build/source/texk/web2c/hitexdir/doc/hitexman.tex 2023-11-13 10:37:38 UTC (rev 68826)
@@ -96,7 +96,7 @@
\medskip
{\tt ruckert\:@cs.hm.edu}
\medskip
-\def\lastrevision{Date: Thu Aug 17 14:00:42 2023}
+\def\lastrevision{Date: Mon Nov 13 10:27:05 2023}
\lastrevision\par
}
\eject
@@ -175,8 +175,8 @@
\subsection{Version and Revision}
The control sequences \ctl{HINTversion}\index{HINTversion+\ctl{HINTversion}}
-and \ctl{HINTsubversion}\index{HINTsubversion+\ctl{HINTsubversion}} are
-used to determine the version and subversion numbers of the HINT output format
+and \ctl{HINTminorversion}\index{HINTminorversion+\ctl{HINTminorversion}} are
+used to determine the major and minor version numbers of the HINT output format
that is generated by Hi\TeX. It can be used as part of the output as
in \verbatim|\the\HINTversion|.
The most important use, however, is testing whether the current \TeX\ engine
Modified: trunk/Build/source/texk/web2c/hitexdir/hiformat.w
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/hiformat.w 2023-11-13 00:43:48 UTC (rev 68825)
+++ trunk/Build/source/texk/web2c/hitexdir/hiformat.w 2023-11-13 10:37:38 UTC (rev 68826)
@@ -156,7 +156,7 @@
First printing: August 2019\par
Second edition: August 2021\par
\medskip
-\def\lastrevision{Date: Thu Aug 17 14:00:42 2023}
+\def\lastrevision{Date: Mon Nov 13 10:27:05 2023}
\lastrevision\par
}
}
@@ -6973,15 +6973,15 @@
s=strtol(t,&t,10);
if (v!=HINT_VERSION)
{ MESSAGE("Wrong HINT version: got %d.%d, expected %d.%d\n",
- v,s,HINT_VERSION,HINT_SUB_VERSION); return false; }
- if (s<HINT_SUB_VERSION)
- { MESSAGE("Old HINT subversion: got %d.%d, expected %d.%d\n",
- v,s,HINT_VERSION,HINT_SUB_VERSION); }
- else if (s>HINT_SUB_VERSION)
- { MESSAGE("New HINT subversion: got %d.%d, expected %d.%d, update your application\n",
- v,s,HINT_VERSION,HINT_SUB_VERSION); }
+ v,s,HINT_VERSION,HINT_MINOR_VERSION); return false; }
+ if (s<HINT_MINOR_VERSION)
+ { MESSAGE("Outdated HINT minor version: got %d.%d, expected %d.%d\n",
+ v,s,HINT_VERSION,HINT_MINOR_VERSION); }
+ else if (s>HINT_MINOR_VERSION)
+ { MESSAGE("More recent HINT minor version: got %d.%d, expected %d.%d, update your application\n",
+ v,s,HINT_VERSION,HINT_MINOR_VERSION); }
if (*t!=' ' && *t!='\n')
- { MESSAGE("Space expected in banner after HINT subversion\n"); return false; }
+ { MESSAGE("Space expected in banner after HINT minor version\n"); return false; }
LOG("%s file version " HINT_VERSION_STRING ":%s", magic, t);
DBG(DBGDIR,"banner size=0x%x\n",hbanner_size);
return true;
@@ -10802,10 +10802,10 @@
#error @=float64 type must have size 8@>
#endif
#define HINT_VERSION 2
-#define HINT_SUB_VERSION 0
+#define HINT_MINOR_VERSION 0
#define AS_STR(X) #X
#define VERSION_AS_STR(X,Y) AS_STR(X) "." AS_STR(Y)
-#define HINT_VERSION_STRING VERSION_AS_STR(HINT_VERSION, HINT_SUB_VERSION)
+#define HINT_VERSION_STRING VERSION_AS_STR(HINT_VERSION, HINT_MINOR_VERSION)
#endif
@
Modified: trunk/Build/source/texk/web2c/hitexdir/hilexer.c
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/hilexer.c 2023-11-13 00:43:48 UTC (rev 68825)
+++ trunk/Build/source/texk/web2c/hitexdir/hilexer.c 2023-11-13 10:37:38 UTC (rev 68826)
@@ -7,7 +7,6 @@
/* A lexical scanner generated by flex */
/* %not-for-header */
-
/* %if-c-only */
/* %if-not-reentrant */
@@ -17,8 +16,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -27,7 +26,7 @@
/* %endif */
/* %if-c-only */
-
+
/* %endif */
/* %if-c-only */
@@ -109,6 +108,10 @@
#define UINT32_MAX (4294967295U)
#endif
+#ifndef SIZE_MAX
+#define SIZE_MAX (~(size_t)0)
+#endif
+
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
@@ -115,44 +118,29 @@
/* %endif */
+/* begin standard C++ headers. */
/* %if-c++-only */
/* %endif */
-#ifdef __cplusplus
+/* TODO: this is always defined, so inline it */
+#define yyconst const
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
#else
-#define yyconst
+#define yynoreturn
#endif
/* %not-for-header */
-
/* Returned upon end-of-file. */
#define YY_NULL 0
/* %ok-for-header */
/* %not-for-header */
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ * integer in range [0..255] for use as an array index.
*/
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
/* %ok-for-header */
/* %if-reentrant */
@@ -167,7 +155,6 @@
* definition of BEGIN.
*/
#define BEGIN (yy_start) = 1 + 2 *
-
/* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility.
@@ -174,18 +161,23 @@
*/
#define YY_START (((yy_start) - 1) / 2)
#define YYSTATE YY_START
-
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin )
-
+#define YY_NEW_FILE yyrestart( yyin )
#define YY_END_OF_BUFFER_CHAR 0
/* 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
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -203,7 +195,7 @@
#endif
/* %if-not-reentrant */
-extern yy_size_t yyleng;
+extern int yyleng;
/* %endif */
/* %if-c-only */
@@ -215,10 +207,10 @@
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
-
+
/* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
* access to the local variable yy_act. Since yyless() is a macro, it would break
- * existing scanners that call yyless() from OUTSIDE yylex.
+ * existing scanners that call yyless() from OUTSIDE yylex.
* One obvious solution it to make yy_act a global. I tried that, and saw
* a 5% performance hit in a non-yylineno scanner, because yy_act is
* normally declared as a register variable-- so it is not worth it.
@@ -230,6 +222,13 @@
if ( yytext[yyl] == '\n' )\
--yylineno;\
}while(0)
+ #define YY_LINENO_REWIND_TO(dst) \
+ do {\
+ const char *p;\
+ for ( p = yy_cp-1; p >= (dst); --p)\
+ if ( *p == '\n' )\
+ --yylineno;\
+ }while(0)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@@ -244,7 +243,6 @@
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
while ( 0 )
-
#define unput(c) yyunput( c, (yytext_ptr) )
#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -264,12 +262,12 @@
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- yy_size_t yy_buf_size;
+ int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -292,7 +290,7 @@
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -319,13 +317,12 @@
/* %if-c-only Standard (non-C++) definition */
/* %not-for-header */
-
/* %if-not-reentrant */
/* Stack of input buffers. */
static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
/* %endif */
/* %ok-for-header */
@@ -340,7 +337,6 @@
#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
? (yy_buffer_stack)[(yy_buffer_stack_top)] \
: NULL)
-
/* Same as previous macro, but useful when we know that the buffer stack is not
* NULL or when we need an lvalue. For internal use only.
*/
@@ -350,14 +346,13 @@
/* %if-not-reentrant */
/* %not-for-header */
-
/* 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. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
static int yy_init = 0; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
@@ -369,52 +364,48 @@
/* %endif */
-void yyrestart (FILE *input_file );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
-void yy_delete_buffer (YY_BUFFER_STATE b );
-void yy_flush_buffer (YY_BUFFER_STATE b );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
-void yypop_buffer_state (void );
+void yyrestart ( FILE *input_file );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
+void yy_delete_buffer ( YY_BUFFER_STATE b );
+void yy_flush_buffer ( YY_BUFFER_STATE b );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
+void yypop_buffer_state ( void );
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
-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 );
-
/* %endif */
-void *yyalloc (yy_size_t );
-void *yyrealloc (void *,yy_size_t );
-void yyfree (void * );
+void *yyalloc ( yy_size_t );
+void *yyrealloc ( void *, yy_size_t );
+void yyfree ( void * );
#define yy_new_buffer yy_create_buffer
-
#define yy_set_interactive(is_interactive) \
{ \
if ( ! YY_CURRENT_BUFFER ){ \
yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
}
-
#define yy_set_bol(at_bol) \
{ \
if ( ! YY_CURRENT_BUFFER ){\
yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
}
-
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
@@ -421,26 +412,29 @@
/* Begin user sect3 */
#define FLEX_DEBUG
+typedef flex_uint8_t YY_CHAR;
-typedef unsigned char YY_CHAR;
+FILE *yyin = NULL, *yyout = NULL;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
typedef int yy_state_type;
extern int yylineno;
-
int yylineno = 1;
extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr yytext
+/* %% [1.5] DFA */
+
/* %if-c-only Standard (non-C++) definition */
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[] );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg );
/* %endif */
@@ -450,12 +444,11 @@
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
- yyleng = (size_t) (yy_cp - yy_bp); \
+ yyleng = (int) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
(yy_c_buf_p) = yy_cp;
-
/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
#define YY_NUM_RULES 129
#define YY_END_OF_BUFFER 130
@@ -466,7 +459,7 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[388] =
+static const flex_int16_t yy_accept[388] =
{ 0,
0, 0, 0, 0, 0, 0, 130, 128, 6, 6,
43, 47, 10, 128, 117, 128, 4, 4, 1, 2,
@@ -512,7 +505,7 @@
38, 93, 127, 120, 127, 122, 0
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
4, 4, 2, 1, 1, 1, 1, 1, 1, 1,
@@ -544,7 +537,7 @@
65, 65, 65, 65, 65
} ;
-static yyconst flex_int32_t yy_meta[66] =
+static const YY_CHAR yy_meta[66] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -555,7 +548,7 @@
4, 1, 1, 1, 4
} ;
-static yyconst flex_int16_t yy_base[393] =
+static const flex_int16_t yy_base[393] =
{ 0,
0, 0, 65, 130, 194, 258, 644, 645, 645, 645,
645, 645, 74, 68, 64, 68, 77, 72, 645, 645,
@@ -603,7 +596,7 @@
} ;
-static yyconst flex_int16_t yy_def[393] =
+static const flex_int16_t yy_def[393] =
{ 0,
387, 1, 388, 388, 389, 389, 387, 387, 387, 387,
387, 387, 390, 391, 387, 387, 387, 387, 387, 387,
@@ -651,7 +644,7 @@
} ;
-static yyconst flex_int16_t yy_nxt[711] =
+static const flex_int16_t yy_nxt[711] =
{ 0,
8, 9, 10, 9, 9, 11, 12, 8, 13, 14,
8, 15, 16, 16, 8, 17, 18, 18, 19, 20,
@@ -733,7 +726,7 @@
387, 387, 387, 387, 387, 387, 387, 387, 387, 387
} ;
-static yyconst flex_int16_t yy_chk[711] =
+static const flex_int16_t yy_chk[711] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -816,7 +809,7 @@
} ;
/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[130] =
+static const flex_int32_t yy_rule_can_match_eol[130] =
{ 0,
0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -832,22 +825,22 @@
extern int yy_flex_debug;
int yy_flex_debug = 1;
-static yyconst flex_int16_t yy_rule_linenum[129] =
+static const flex_int16_t yy_rule_linenum[129] =
{ 0,
- 170, 171, 172, 173, 174, 175, 176, 178, 180, 182,
- 184, 185, 186, 187, 188, 193, 194, 195, 196, 197,
- 198, 199, 200, 202, 204, 206, 207, 208, 209, 211,
- 212, 213, 215, 216, 217, 219, 220, 222, 224, 225,
- 226, 228, 229, 231, 232, 233, 235, 238, 240, 241,
- 243, 244, 245, 246, 247, 248, 249, 251, 252, 254,
- 256, 257, 258, 259, 260, 261, 262, 263, 264, 267,
- 269, 270, 271, 273, 274, 275, 276, 279, 280, 281,
- 283, 284, 285, 286, 287, 288, 289, 291, 292, 293,
- 294, 296, 298, 300, 302, 304, 306, 307, 309, 311,
+ 171, 172, 173, 174, 175, 176, 177, 179, 181, 183,
+ 185, 186, 187, 188, 189, 194, 195, 196, 197, 198,
+ 199, 200, 201, 203, 205, 207, 208, 209, 210, 212,
+ 213, 214, 216, 217, 218, 220, 221, 223, 225, 226,
+ 227, 229, 230, 232, 233, 234, 236, 239, 241, 242,
+ 244, 245, 246, 247, 248, 249, 250, 252, 253, 255,
+ 257, 258, 259, 260, 261, 262, 263, 264, 265, 268,
+ 270, 271, 272, 274, 275, 276, 277, 280, 281, 282,
+ 284, 285, 286, 287, 288, 289, 290, 292, 293, 294,
+ 295, 297, 299, 301, 303, 305, 307, 308, 310, 312,
- 312, 313, 314, 316, 317, 318, 320, 321, 322, 324,
- 326, 328, 330, 331, 332, 333, 334, 336, 338, 340,
- 341, 343, 345, 347, 349, 351, 353, 354
+ 313, 314, 315, 317, 318, 319, 321, 322, 323, 325,
+ 327, 329, 331, 332, 333, 334, 335, 337, 339, 341,
+ 342, 344, 346, 348, 350, 352, 354, 355
} ;
/* The intent behind this definition is that it'll catch
@@ -859,8 +852,8 @@
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
#line 1 "lexer.l"
-/*533:*/
-#line 3 "lexer.l"
+#line 2 "lexer.l"
+ /*533:*/
#line 11098 "format.w"
#include "hibasetypes.h"
@@ -1003,19 +996,21 @@
#pragma warning( disable : 4267)
#endif
+#line 1000 "lexer.c"
#define YY_NO_UNISTD_H 1
#define YY_NO_INPUT 1
-/*24:*/
-/*:24*/ /*33:*/
+#line 152 "lexer.l"
+ /*24:*/
+ /*:24*/ /*33:*/
-/*:33*/ /*40:*/
-/*:40*/ /*42:*/
-/*:42*/ /*44:*/
-/*:44*/ /*46:*/
-/*:46*/ /*150:*/
+ /*:33*/ /*40:*/
+ /*:40*/ /*42:*/
+ /*:42*/ /*44:*/
+ /*:44*/ /*46:*/
+ /*:46*/ /*150:*/
-/*:150*/
-#line 1019 "lexer.c"
+ /*:150*/
+#line 1014 "lexer.c"
#define INITIAL 0
#define STR 1
@@ -1041,7 +1036,7 @@
/* %if-reentrant */
/* %if-c-only */
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
/* %endif */
/* %if-reentrant */
@@ -1051,31 +1046,31 @@
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy (void );
+int yylex_destroy ( void );
-int yyget_debug (void );
+int yyget_debug ( void );
-void yyset_debug (int debug_flag );
+void yyset_debug ( int debug_flag );
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
-void yyset_extra (YY_EXTRA_TYPE user_defined );
+void yyset_extra ( YY_EXTRA_TYPE user_defined );
-FILE *yyget_in (void );
+FILE *yyget_in ( void );
-void yyset_in (FILE * in_str );
+void yyset_in ( FILE * _in_str );
-FILE *yyget_out (void );
+FILE *yyget_out ( void );
-void yyset_out (FILE * out_str );
+void yyset_out ( FILE * _out_str );
-yy_size_t yyget_leng (void );
+ int yyget_leng ( void );
-char *yyget_text (void );
+char *yyget_text ( void );
-int yyget_lineno (void );
+int yyget_lineno ( void );
-void yyset_lineno (int line_number );
+void yyset_lineno ( int _line_number );
/* %if-bison-bridge */
/* %endif */
@@ -1086,34 +1081,35 @@
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap ( void );
#else
-extern int yywrap (void );
+extern int yywrap ( void );
#endif
#endif
/* %not-for-header */
-
+#ifndef YY_NO_UNPUT
+
+#endif
/* %ok-for-header */
/* %endif */
#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
#endif
#ifndef YY_NO_INPUT
/* %if-c-only Standard (non-C++) definition */
/* %not-for-header */
-
#ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
#else
-static int input (void );
+static int input ( void );
#endif
/* %ok-for-header */
@@ -1126,15 +1122,20 @@
static int yy_start_stack_depth = 0;
static int *yy_start_stack = NULL;
- static void yy_push_state (int new_state );
+ static void yy_push_state ( int _new_state );
- static void yy_pop_state (void );
+ static void yy_pop_state ( void );
/* %endif */
/* 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
/* Copy whatever the last rule matched to the standard output. */
@@ -1143,7 +1144,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
/* %endif */
/* %if-c++-only C++ definition */
/* %endif */
@@ -1158,7 +1159,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1171,7 +1172,7 @@
else \
{ \
errno=0; \
- while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+ while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
{ \
if( errno != EINTR) \
{ \
@@ -1212,11 +1213,9 @@
/* %if-tables-serialization structures and prototypes */
/* %not-for-header */
-
/* %ok-for-header */
/* %not-for-header */
-
/* %tables-yydmap generated elements */
/* %endif */
/* end tables serialization structures and prototypes */
@@ -1247,7 +1246,7 @@
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
/* %% [6.0] YY_RULE_SETUP definition goes here */
@@ -1255,22 +1254,14 @@
YY_USER_ACTION
/* %not-for-header */
-
/** The main scanner function which does all the work.
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
-/* %% [7.0] user's declarations go here */
-#line 167 "lexer.l"
-
-
- /*3:*/
-#line 1273 "lexer.c"
-
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -1299,13 +1290,21 @@
if ( ! YY_CURRENT_BUFFER ) {
yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
+ yy_create_buffer( yyin, YY_BUF_SIZE );
}
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
}
- while ( 1 ) /* loops until end-of-file is reached */
+ {
+/* %% [7.0] user's declarations go here */
+#line 168 "lexer.l"
+
+
+ /*3:*/
+#line 1306 "lexer.c"
+
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
/* %% [8.0] yymore()-related code goes here */
yy_cp = (yy_c_buf_p);
@@ -1323,7 +1322,7 @@
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1333,9 +1332,9 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 388 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp;
}
while ( yy_current_state != 387 );
@@ -1355,7 +1354,7 @@
int yyl;
for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' )
-
+
yylineno++;
;
}
@@ -1391,84 +1390,84 @@
case 1:
YY_RULE_SETUP
-#line 170 "lexer.l"
+#line 171 "lexer.l"
SCAN_START;return START;
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 171 "lexer.l"
+#line 172 "lexer.l"
SCAN_END;return END;
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 172 "lexer.l"
+#line 173 "lexer.l"
return GLYPH;
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 173 "lexer.l"
+#line 174 "lexer.l"
SCAN_UDEC(yytext);return UNSIGNED;
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 174 "lexer.l"
+#line 175 "lexer.l"
SCAN_UDEC(yytext+1);return REFERENCE;
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 175 "lexer.l"
+#line 176 "lexer.l"
;
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 176 "lexer.l"
+#line 177 "lexer.l"
;
YY_BREAK
/*:3*/ /*25:*/
case 8:
YY_RULE_SETUP
-#line 178 "lexer.l"
+#line 179 "lexer.l"
SCAN_HEX(yytext+2);return UNSIGNED;
YY_BREAK
/*:25*/ /*28:*/
case 9:
YY_RULE_SETUP
-#line 180 "lexer.l"
+#line 181 "lexer.l"
SCAN_DEC(yytext);return SIGNED;
YY_BREAK
/*:28*/ /*35:*/
case 10:
YY_RULE_SETUP
-#line 182 "lexer.l"
+#line 183 "lexer.l"
STR_START;BEGIN(STR);
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 184 "lexer.l"
+#line 185 "lexer.l"
STR_END;SCAN_STR;BEGIN(INITIAL);return STRING;
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 185 "lexer.l"
+#line 186 "lexer.l"
STR_ADD('\'');
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 186 "lexer.l"
+#line 187 "lexer.l"
STR_ADD(yytext[0]);
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 187 "lexer.l"
+#line 188 "lexer.l"
RNG("String character",yytext[0],0x20,0x7E);
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 188 "lexer.l"
+#line 189 "lexer.l"
QUIT("Unterminated String in line %d",yylineno);
YY_BREAK
@@ -1475,328 +1474,328 @@
/*:35*/ /*49:*/
case 16:
YY_RULE_SETUP
-#line 193 "lexer.l"
+#line 194 "lexer.l"
STR_START;STR_PUT('\'');BEGIN(STR);
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 194 "lexer.l"
+#line 195 "lexer.l"
SCAN_UTF8_1(yytext+1);return CHARCODE;
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 195 "lexer.l"
+#line 196 "lexer.l"
STR_START;STR_PUT(yytext[1]);STR_PUT('\'');BEGIN(STR);
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 196 "lexer.l"
+#line 197 "lexer.l"
STR_START;STR_PUT('\'');STR_PUT('\'');BEGIN(STR);
YY_BREAK
case 20:
/* rule 20 can match eol */
YY_RULE_SETUP
-#line 197 "lexer.l"
+#line 198 "lexer.l"
SCAN_UTF8_1(yytext+1);return CHARCODE;
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 198 "lexer.l"
+#line 199 "lexer.l"
SCAN_UTF8_2(yytext+1);return CHARCODE;
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 199 "lexer.l"
+#line 200 "lexer.l"
SCAN_UTF8_3(yytext+1);return CHARCODE;
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 200 "lexer.l"
+#line 201 "lexer.l"
SCAN_UTF8_4(yytext+1);return CHARCODE;
YY_BREAK
/*:49*/ /*56:*/
case 24:
YY_RULE_SETUP
-#line 202 "lexer.l"
+#line 203 "lexer.l"
SCAN_DECFLOAT;return FPNUM;
YY_BREAK
/*:56*/ /*60:*/
case 25:
YY_RULE_SETUP
-#line 204 "lexer.l"
+#line 205 "lexer.l"
SCAN_HEXFLOAT;return FPNUM;
YY_BREAK
/*:60*/ /*81:*/
case 26:
YY_RULE_SETUP
-#line 206 "lexer.l"
+#line 207 "lexer.l"
return DIMEN;
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 207 "lexer.l"
+#line 208 "lexer.l"
return PT;
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 208 "lexer.l"
+#line 209 "lexer.l"
return MM;
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 209 "lexer.l"
+#line 210 "lexer.l"
return INCH;
YY_BREAK
/*:81*/ /*89:*/
case 30:
YY_RULE_SETUP
-#line 211 "lexer.l"
+#line 212 "lexer.l"
return XDIMEN;
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 212 "lexer.l"
+#line 213 "lexer.l"
return H;
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 213 "lexer.l"
+#line 214 "lexer.l"
return V;
YY_BREAK
/*:89*/ /*100:*/
case 33:
YY_RULE_SETUP
-#line 215 "lexer.l"
+#line 216 "lexer.l"
return FIL;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 216 "lexer.l"
+#line 217 "lexer.l"
return FILL;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 217 "lexer.l"
+#line 218 "lexer.l"
return FILLL;
YY_BREAK
/*:100*/ /*104:*/
case 36:
YY_RULE_SETUP
-#line 219 "lexer.l"
+#line 220 "lexer.l"
return PENALTY;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 220 "lexer.l"
+#line 221 "lexer.l"
return INTEGER;
YY_BREAK
/*:104*/ /*110:*/
case 38:
YY_RULE_SETUP
-#line 222 "lexer.l"
+#line 223 "lexer.l"
return LANGUAGE;
YY_BREAK
/*:110*/ /*116:*/
case 39:
YY_RULE_SETUP
-#line 224 "lexer.l"
+#line 225 "lexer.l"
return RULE;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 225 "lexer.l"
+#line 226 "lexer.l"
return RUNNING;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 226 "lexer.l"
+#line 227 "lexer.l"
return RUNNING;
YY_BREAK
/*:116*/ /*125:*/
case 42:
YY_RULE_SETUP
-#line 228 "lexer.l"
+#line 229 "lexer.l"
return KERN;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 229 "lexer.l"
+#line 230 "lexer.l"
return EXPLICIT;
YY_BREAK
/*:125*/ /*134:*/
case 44:
YY_RULE_SETUP
-#line 231 "lexer.l"
+#line 232 "lexer.l"
return GLUE;
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 232 "lexer.l"
+#line 233 "lexer.l"
return PLUS;
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 233 "lexer.l"
+#line 234 "lexer.l"
return MINUS;
YY_BREAK
/*:134*/ /*152:*/
case 47:
YY_RULE_SETUP
-#line 235 "lexer.l"
+#line 236 "lexer.l"
SCAN_TXT_START;return TXT_START;
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 238 "lexer.l"
+#line 239 "lexer.l"
SCAN_TXT_END;return TXT_END;
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 240 "lexer.l"
+#line 241 "lexer.l"
SCAN_START;return START;
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 241 "lexer.l"
+#line 242 "lexer.l"
QUIT("> not allowed in text mode");
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 243 "lexer.l"
+#line 244 "lexer.l"
yylval.u= '\\';return TXT_CC;
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 244 "lexer.l"
+#line 245 "lexer.l"
yylval.u= '"';return TXT_CC;
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 245 "lexer.l"
+#line 246 "lexer.l"
yylval.u= '<';return TXT_CC;
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 246 "lexer.l"
+#line 247 "lexer.l"
yylval.u= '>';return TXT_CC;
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 247 "lexer.l"
+#line 248 "lexer.l"
yylval.u= ' ';return TXT_CC;
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 248 "lexer.l"
+#line 249 "lexer.l"
yylval.u= '-';return TXT_CC;
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 249 "lexer.l"
+#line 250 "lexer.l"
return TXT_IGNORE;
YY_BREAK
case 58:
/* rule 58 can match eol */
YY_RULE_SETUP
-#line 251 "lexer.l"
+#line 252 "lexer.l"
return TXT_FONT_GLUE;
YY_BREAK
case 59:
/* rule 59 can match eol */
YY_RULE_SETUP
-#line 252 "lexer.l"
+#line 253 "lexer.l"
;
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 254 "lexer.l"
+#line 255 "lexer.l"
yylval.u= yytext[1]-'0';return TXT_FONT;
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 256 "lexer.l"
+#line 257 "lexer.l"
SCAN_REF(font_kind);return TXT_GLOBAL;
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 257 "lexer.l"
+#line 258 "lexer.l"
SCAN_REF(penalty_kind);return TXT_GLOBAL;
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 258 "lexer.l"
+#line 259 "lexer.l"
SCAN_REF(kern_kind);return TXT_GLOBAL;
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 259 "lexer.l"
+#line 260 "lexer.l"
SCAN_REF(ligature_kind);return TXT_GLOBAL;
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 260 "lexer.l"
+#line 261 "lexer.l"
SCAN_REF(disc_kind);return TXT_GLOBAL;
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 261 "lexer.l"
+#line 262 "lexer.l"
SCAN_REF(glue_kind);return TXT_GLOBAL;
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 262 "lexer.l"
+#line 263 "lexer.l"
SCAN_REF(language_kind);return TXT_GLOBAL;
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 263 "lexer.l"
+#line 264 "lexer.l"
SCAN_REF(rule_kind);return TXT_GLOBAL;
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 264 "lexer.l"
+#line 265 "lexer.l"
SCAN_REF(image_kind);return TXT_GLOBAL;
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 267 "lexer.l"
+#line 268 "lexer.l"
SCAN_UDEC(yytext+2);return TXT_CC;
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 269 "lexer.l"
+#line 270 "lexer.l"
yylval.u= yytext[1]-'a';return TXT_LOCAL;
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 270 "lexer.l"
+#line 271 "lexer.l"
return TXT_FONT_GLUE;
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 271 "lexer.l"
+#line 272 "lexer.l"
return TXT_FONT_HYPHEN;
YY_BREAK
case 74:
/* rule 74 can match eol */
YY_RULE_SETUP
-#line 273 "lexer.l"
+#line 274 "lexer.l"
SCAN_UTF8_1(yytext);return TXT_CC;
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 274 "lexer.l"
+#line 275 "lexer.l"
SCAN_UTF8_2(yytext);return TXT_CC;
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 275 "lexer.l"
+#line 276 "lexer.l"
SCAN_UTF8_3(yytext);return TXT_CC;
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 276 "lexer.l"
+#line 277 "lexer.l"
SCAN_UTF8_4(yytext);return TXT_CC;
YY_BREAK
@@ -1803,290 +1802,290 @@
/*:152*/ /*162:*/
case 78:
YY_RULE_SETUP
-#line 279 "lexer.l"
+#line 280 "lexer.l"
return HBOX;
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 280 "lexer.l"
+#line 281 "lexer.l"
return VBOX;
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 281 "lexer.l"
+#line 282 "lexer.l"
return SHIFTED;
YY_BREAK
/*:162*/ /*170:*/
case 81:
YY_RULE_SETUP
-#line 283 "lexer.l"
+#line 284 "lexer.l"
return HPACK;
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 284 "lexer.l"
+#line 285 "lexer.l"
return HSET;
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 285 "lexer.l"
+#line 286 "lexer.l"
return VPACK;
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 286 "lexer.l"
+#line 287 "lexer.l"
return VSET;
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 287 "lexer.l"
+#line 288 "lexer.l"
return ADD;
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 288 "lexer.l"
+#line 289 "lexer.l"
return TO;
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 289 "lexer.l"
+#line 290 "lexer.l"
return DEPTH;
YY_BREAK
/*:170*/ /*175:*/
case 88:
YY_RULE_SETUP
-#line 291 "lexer.l"
+#line 292 "lexer.l"
return LEADERS;
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 292 "lexer.l"
+#line 293 "lexer.l"
return ALIGN;
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 293 "lexer.l"
+#line 294 "lexer.l"
return CENTER;
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 294 "lexer.l"
+#line 295 "lexer.l"
return EXPAND;
YY_BREAK
/*:175*/ /*182:*/
case 92:
YY_RULE_SETUP
-#line 296 "lexer.l"
+#line 297 "lexer.l"
return BASELINE;
YY_BREAK
/*:182*/ /*189:*/
case 93:
YY_RULE_SETUP
-#line 298 "lexer.l"
+#line 299 "lexer.l"
return LIGATURE;
YY_BREAK
/*:189*/ /*197:*/
case 94:
YY_RULE_SETUP
-#line 300 "lexer.l"
+#line 301 "lexer.l"
return DISC;
YY_BREAK
/*:197*/ /*205:*/
case 95:
YY_RULE_SETUP
-#line 302 "lexer.l"
+#line 303 "lexer.l"
return PAR;
YY_BREAK
/*:205*/ /*210:*/
case 96:
YY_RULE_SETUP
-#line 304 "lexer.l"
+#line 305 "lexer.l"
return MATH;
YY_BREAK
/*:210*/ /*215:*/
case 97:
YY_RULE_SETUP
-#line 306 "lexer.l"
+#line 307 "lexer.l"
return ON;
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 307 "lexer.l"
+#line 308 "lexer.l"
return OFF;
YY_BREAK
/*:215*/ /*219:*/
case 99:
YY_RULE_SETUP
-#line 309 "lexer.l"
+#line 310 "lexer.l"
return ADJUST;
YY_BREAK
/*:219*/ /*223:*/
case 100:
YY_RULE_SETUP
-#line 311 "lexer.l"
+#line 312 "lexer.l"
return TABLE;
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 312 "lexer.l"
+#line 313 "lexer.l"
return ITEM;
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 313 "lexer.l"
+#line 314 "lexer.l"
return ITEM;
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 314 "lexer.l"
+#line 315 "lexer.l"
return ITEM;
YY_BREAK
/*:223*/ /*230:*/
case 104:
YY_RULE_SETUP
-#line 316 "lexer.l"
+#line 317 "lexer.l"
return IMAGE;
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 317 "lexer.l"
+#line 318 "lexer.l"
return WIDTH;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 318 "lexer.l"
+#line 319 "lexer.l"
return HEIGHT;
YY_BREAK
/*:230*/ /*255:*/
case 107:
YY_RULE_SETUP
-#line 320 "lexer.l"
+#line 321 "lexer.l"
return LABEL;
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 321 "lexer.l"
+#line 322 "lexer.l"
return BOT;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 322 "lexer.l"
+#line 323 "lexer.l"
return MID;
YY_BREAK
/*:255*/ /*269:*/
case 110:
YY_RULE_SETUP
-#line 324 "lexer.l"
+#line 325 "lexer.l"
return LINK;
YY_BREAK
/*:269*/ /*279:*/
case 111:
YY_RULE_SETUP
-#line 326 "lexer.l"
+#line 327 "lexer.l"
return OUTLINE;
YY_BREAK
/*:279*/ /*286:*/
case 112:
YY_RULE_SETUP
-#line 328 "lexer.l"
+#line 329 "lexer.l"
return UNKNOWN;
YY_BREAK
/*:286*/ /*295:*/
case 113:
YY_RULE_SETUP
-#line 330 "lexer.l"
+#line 331 "lexer.l"
if(section_no==1)return STREAMDEF;else return STREAM;
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 331 "lexer.l"
+#line 332 "lexer.l"
return FIRST;
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 332 "lexer.l"
+#line 333 "lexer.l"
return LAST;
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 333 "lexer.l"
+#line 334 "lexer.l"
return TOP;
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 334 "lexer.l"
+#line 335 "lexer.l"
return NOREFERENCE;
YY_BREAK
/*:295*/ /*305:*/
case 118:
YY_RULE_SETUP
-#line 336 "lexer.l"
+#line 337 "lexer.l"
return PAGE;
YY_BREAK
/*:305*/ /*313:*/
case 119:
YY_RULE_SETUP
-#line 338 "lexer.l"
+#line 339 "lexer.l"
return RANGE;
YY_BREAK
/*:313*/ /*340:*/
case 120:
YY_RULE_SETUP
-#line 340 "lexer.l"
+#line 341 "lexer.l"
return DIRECTORY;
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 341 "lexer.l"
+#line 342 "lexer.l"
return SECTION;
YY_BREAK
/*:340*/ /*361:*/
case 122:
YY_RULE_SETUP
-#line 343 "lexer.l"
+#line 344 "lexer.l"
return DEFINITIONS;
YY_BREAK
/*:361*/ /*369:*/
case 123:
YY_RULE_SETUP
-#line 345 "lexer.l"
+#line 346 "lexer.l"
return MAX;
YY_BREAK
/*:369*/ /*384:*/
case 124:
YY_RULE_SETUP
-#line 347 "lexer.l"
+#line 348 "lexer.l"
return PARAM;
YY_BREAK
/*:384*/ /*393:*/
case 125:
YY_RULE_SETUP
-#line 349 "lexer.l"
+#line 350 "lexer.l"
return FONT;
YY_BREAK
/*:393*/ /*424:*/
case 126:
YY_RULE_SETUP
-#line 351 "lexer.l"
+#line 352 "lexer.l"
return CONTENT;
YY_BREAK
/*:424*/
case 127:
YY_RULE_SETUP
-#line 353 "lexer.l"
+#line 354 "lexer.l"
QUIT("Unexpected keyword '%s' in line %d",yytext,yylineno);
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 354 "lexer.l"
+#line 355 "lexer.l"
QUIT("Unexpected character '%c' (0x%02X) in line %d",yytext[0]>' '?yytext[0]:' ',yytext[0],yylineno);
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 356 "lexer.l"
+#line 357 "lexer.l"
ECHO;
YY_BREAK
-#line 2090 "lexer.c"
+#line 2089 "lexer.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(STR):
case YY_STATE_EOF(TXT):
@@ -2113,7 +2112,11 @@
* back-up) that will match for the new input source.
*/
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+/* %if-c-only */
YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
}
@@ -2168,7 +2171,7 @@
{
(yy_did_buffer_switch_on_eof) = 0;
- if ( yywrap( ) )
+ if ( yywrap( ) )
{
/* Note: because we've taken care in
* yy_get_next_buffer() to have set up
@@ -2221,12 +2224,12 @@
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
+ } /* end of user's declarations */
} /* end of yylex */
/* %ok-for-header */
/* %if-c++-only */
/* %not-for-header */
-
/* %ok-for-header */
/* %endif */
@@ -2244,9 +2247,9 @@
/* %if-c++-only */
/* %endif */
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = (yytext_ptr);
+ int number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -2275,7 +2278,7 @@
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -2288,7 +2291,7 @@
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -2302,7 +2305,7 @@
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 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -2311,11 +2314,12 @@
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ yyrealloc( (void *) b->yy_ch_buf,
+ (yy_size_t) (b->yy_buf_size + 2) );
}
else
/* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
+ b->yy_ch_buf = NULL;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@@ -2343,7 +2347,7 @@
if ( number_to_move == YY_MORE_ADJ )
{
ret_val = EOB_ACT_END_OF_FILE;
- yyrestart(yyin );
+ yyrestart( yyin );
}
else
@@ -2357,12 +2361,15 @@
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
+ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+ (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ /* "- 2" to take care of EOB's */
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
}
(yy_n_chars) += number_to_move;
@@ -2378,14 +2385,13 @@
/* %if-c-only */
/* %not-for-header */
-
static yy_state_type yy_get_previous_state (void)
/* %endif */
/* %if-c++-only */
/* %endif */
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
/* %% [15.0] code to get the start state into yy_current_state goes here */
yy_current_state = (yy_start);
@@ -2393,7 +2399,7 @@
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
/* %% [16.0] code to find the next state goes here */
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -2403,9 +2409,9 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 388 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
}
return yy_current_state;
@@ -2422,11 +2428,11 @@
/* %if-c++-only */
/* %endif */
{
- register int yy_is_jam;
+ int yy_is_jam;
/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
- register char *yy_cp = (yy_c_buf_p);
+ char *yy_cp = (yy_c_buf_p);
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -2436,17 +2442,19 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 388 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
yy_is_jam = (yy_current_state == 387);
return yy_is_jam ? 0 : yy_current_state;
}
+#ifndef YY_NO_UNPUT
/* %if-c-only */
/* %endif */
+#endif
/* %if-c-only */
#ifndef YY_NO_INPUT
@@ -2476,7 +2484,7 @@
else
{ /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+ int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -2493,14 +2501,14 @@
*/
/* Reset buffer status. */
- yyrestart(yyin );
+ yyrestart( yyin );
/*FALLTHROUGH*/
case EOB_ACT_END_OF_FILE:
{
- if ( yywrap( ) )
- return EOF;
+ if ( yywrap( ) )
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -2524,7 +2532,7 @@
/* %% [19.0] update BOL and yylineno */
if ( c == '\n' )
-
+
yylineno++;
;
@@ -2549,13 +2557,16 @@
if ( ! YY_CURRENT_BUFFER ){
yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
+ yy_create_buffer( yyin, YY_BUF_SIZE );
}
- yy_init_buffer(YY_CURRENT_BUFFER,input_file );
- yy_load_buffer_state( );
+ yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+ yy_load_buffer_state( );
}
+/* %if-c++-only */
+/* %endif */
+
/** Switch to a different input buffer.
* @param new_buffer The new input buffer.
*
@@ -2585,7 +2596,7 @@
}
YY_CURRENT_BUFFER_LVALUE = new_buffer;
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
/* We don't actually know whether we did this switch during
* EOF (yywrap()) processing, but the only time this flag
@@ -2603,7 +2614,11 @@
{
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+/* %if-c-only */
yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
(yy_hold_char) = *(yy_c_buf_p);
}
@@ -2621,7 +2636,7 @@
{
YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -2630,17 +2645,20 @@
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
- b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
+ b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) );
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
b->yy_is_our_buffer = 1;
- yy_init_buffer(b,file );
+ yy_init_buffer( b, file );
return b;
}
+/* %if-c++-only */
+/* %endif */
+
/** Destroy the buffer.
* @param b a buffer created with yy_create_buffer()
*
@@ -2659,9 +2677,9 @@
YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yyfree((void *) b->yy_ch_buf );
+ yyfree( (void *) b->yy_ch_buf );
- yyfree((void *) b );
+ yyfree( (void *) b );
}
/* Initializes or reinitializes a buffer.
@@ -2677,9 +2695,13 @@
{
int oerrno = errno;
- yy_flush_buffer(b );
+ yy_flush_buffer( b );
+/* %if-c-only */
b->yy_input_file = file;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
b->yy_fill_buffer = 1;
/* If b is the current buffer, then yy_init_buffer was _probably_
@@ -2729,7 +2751,7 @@
b->yy_buffer_status = YY_BUFFER_NEW;
if ( b == YY_CURRENT_BUFFER )
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
}
/* %if-c-or-c++ */
@@ -2765,7 +2787,7 @@
YY_CURRENT_BUFFER_LVALUE = new_buffer;
/* copied from yy_switch_to_buffer. */
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
/* %endif */
@@ -2790,7 +2812,7 @@
--(yy_buffer_stack_top);
if (YY_CURRENT_BUFFER) {
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
}
@@ -2814,15 +2836,15 @@
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+
(yy_buffer_stack_max) = num_to_alloc;
(yy_buffer_stack_top) = 0;
return;
@@ -2831,7 +2853,7 @@
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@@ -2853,7 +2875,7 @@
* @param base the character buffer
* @param size the size in bytes of the character buffer
*
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
{
@@ -2863,16 +2885,16 @@
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
- return 0;
+ return NULL;
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
+ b->yy_input_file = NULL;
b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0;
b->yy_at_bol = 1;
@@ -2879,7 +2901,7 @@
b->yy_fill_buffer = 0;
b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer(b );
+ yy_switch_to_buffer( b );
return b;
}
@@ -2894,10 +2916,10 @@
* @note If you want to scan bytes that may contain NUL values, then use
* yy_scan_bytes() instead.
*/
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
{
- return yy_scan_bytes(yystr,strlen(yystr) );
+ return yy_scan_bytes( yystr, (int) strlen(yystr) );
}
/* %endif */
@@ -2909,7 +2931,7 @@
*
* @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 (const char * yybytes, int _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
@@ -2917,8 +2939,8 @@
int i;
/* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) yyalloc(n );
+ n = (yy_size_t) (_yybytes_len + 2);
+ buf = (char *) yyalloc( n );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -2927,7 +2949,7 @@
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = yy_scan_buffer(buf,n );
+ b = yy_scan_buffer( buf, n );
if ( ! b )
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -2941,7 +2963,7 @@
/* %endif */
/* %if-c-only */
- static void yy_push_state (int new_state )
+ static void yy_push_state (int _new_state )
/* %endif */
/* %if-c++-only */
/* %endif */
@@ -2951,13 +2973,14 @@
yy_size_t new_size;
(yy_start_stack_depth) += YY_START_STACK_INCR;
- new_size = (yy_start_stack_depth) * sizeof( int );
+ new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int );
if ( ! (yy_start_stack) )
- (yy_start_stack) = (int *) yyalloc(new_size );
+ (yy_start_stack) = (int *) yyalloc( new_size );
else
- (yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size );
+ (yy_start_stack) = (int *) yyrealloc(
+ (void *) (yy_start_stack), new_size );
if ( ! (yy_start_stack) )
YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
@@ -2965,7 +2988,7 @@
(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
- BEGIN(new_state);
+ BEGIN(_new_state);
}
/* %if-c-only */
@@ -2985,9 +3008,9 @@
#endif
/* %if-c-only */
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
+ fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
/* %endif */
@@ -3022,7 +3045,7 @@
*/
int yyget_lineno (void)
{
-
+
return yylineno;
}
@@ -3045,7 +3068,7 @@
/** Get the length of the current token.
*
*/
-yy_size_t yyget_leng (void)
+int yyget_leng (void)
{
return yyleng;
}
@@ -3063,29 +3086,29 @@
/* %endif */
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
*
*/
-void yyset_lineno (int line_number )
+void yyset_lineno (int _line_number )
{
- yylineno = line_number;
+ yylineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see yy_switch_to_buffer
*/
-void yyset_in (FILE * in_str )
+void yyset_in (FILE * _in_str )
{
- yyin = in_str ;
+ yyin = _in_str ;
}
-void yyset_out (FILE * out_str )
+void yyset_out (FILE * _out_str )
{
- yyout = out_str ;
+ yyout = _out_str ;
}
int yyget_debug (void)
@@ -3093,9 +3116,9 @@
return yy_flex_debug;
}
-void yyset_debug (int bdebug )
+void yyset_debug (int _bdebug )
{
- yy_flex_debug = bdebug ;
+ yy_flex_debug = _bdebug ;
}
/* %endif */
@@ -3115,10 +3138,10 @@
/* We do not touch yylineno unless the option is enabled. */
yylineno = 1;
- (yy_buffer_stack) = 0;
+ (yy_buffer_stack) = NULL;
(yy_buffer_stack_top) = 0;
(yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
+ (yy_c_buf_p) = NULL;
(yy_init) = 0;
(yy_start) = 0;
@@ -3131,8 +3154,8 @@
yyin = stdin;
yyout = stdout;
#else
- yyin = (FILE *) 0;
- yyout = (FILE *) 0;
+ yyin = NULL;
+ yyout = NULL;
#endif
/* For future reference: Set errno on error, since we are called by
@@ -3149,7 +3172,7 @@
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
- yy_delete_buffer(YY_CURRENT_BUFFER );
+ yy_delete_buffer( YY_CURRENT_BUFFER );
YY_CURRENT_BUFFER_LVALUE = NULL;
yypop_buffer_state();
}
@@ -3159,7 +3182,7 @@
(yy_buffer_stack) = NULL;
/* Destroy the start condition stack. */
- yyfree((yy_start_stack) );
+ yyfree( (yy_start_stack) );
(yy_start_stack) = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
@@ -3177,9 +3200,10 @@
*/
#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
{
- register int i;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -3186,9 +3210,9 @@
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -3198,11 +3222,12 @@
void *yyalloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return malloc(size);
}
void *yyrealloc (void * ptr, yy_size_t size )
{
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -3210,12 +3235,12 @@
* any pointer type to void*, and deal with argument conversions
* as though doing an assignment.
*/
- return (void *) realloc( (char *) ptr, size );
+ return realloc(ptr, size);
}
void yyfree (void * ptr )
{
- free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
+ free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
}
/* %if-tables-serialization definitions */
@@ -3225,8 +3250,7 @@
/* %ok-for-header */
-#line 356 "lexer.l"
+#line 357 "lexer.l"
-
/*:533*/
Modified: trunk/Build/source/texk/web2c/hitexdir/hitex.w
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/hitex.w 2023-11-13 00:43:48 UTC (rev 68825)
+++ trunk/Build/source/texk/web2c/hitexdir/hitex.w 2023-11-13 10:37:38 UTC (rev 68826)
@@ -10998,7 +10998,7 @@
done: name=a_make_name_string(&cur_file);@/
if (source_filename_stack[in_open]==NULL)
free(source_filename_stack[in_open]);
-source_filename_stack[in_open]=strdup(name_of_file+1); /*\TeX\ Live*/
+source_filename_stack[in_open]=strdup((char *)name_of_file+1); /*\TeX\ Live*/
if (full_source_filename_stack[in_open]==NULL)
free(full_source_filename_stack[in_open]);
full_source_filename_stack[in_open]=strdup(full_name_of_file);
@@ -25715,8 +25715,8 @@
primitive("HINTversion", last_item, HINT_version_code);
@!@:HINT\_version\_}{\.{\\HINTversion} primitive@>
-primitive("HINTsubversion", last_item, HINT_subversion_code);
-@!@:HINT\_subversion\_}{\.{\\HINTsubversion} primitive@>
+primitive("HINTminorversion", last_item, HINT_minor_version_code);
+@!@:HINT\_minor\_version\_}{\.{\\HINTminorversion} primitive@>
primitive("HINTdest", extension, label_node);@/
@!@:HINTdest\_}{\.{\\HINTdest} primitive@>
@@ -30447,21 +30447,21 @@
the new engine returns a version number as an integer
extending the cases for |last_item|. Since the additional
primitives that we define are specific to the \HINT\ format,
-we return version and subversion of the \HINT\ file
+we return major and minor version of the \HINT\ file
format that this program will generate.
@d HINT_version_code (eTeX_last_last_item_cmd_mod+7) /* \.{\\HINTversion} */
- at d HINT_subversion_code (eTeX_last_last_item_cmd_mod+8) /* \.{\\HINTsubversion} */
+ at d HINT_minor_version_code (eTeX_last_last_item_cmd_mod+8) /* \.{\\HINTminorversion} */
@ Now this new primitive needs its implementation.
@<Cases of |last_item| for |print_cmd_chr|@>=
case HINT_version_code: print_esc("HINTversion");@+break;
-case HINT_subversion_code: print_esc("HINTsubversion");@+break;
+case HINT_minor_version_code: print_esc("HINTminorversion");@+break;
@ @<Cases for fetching a \Prote\ int value@>=
case HINT_version_code: cur_val=HINT_VERSION;@+break;
-case HINT_subversion_code: cur_val=HINT_SUB_VERSION;@+break;
+case HINT_minor_version_code: cur_val=HINT_MINOR_VERSION;@+break;
@ The implementation reuses code that has been written as part of
@@ -34434,8 +34434,9 @@
{ fprintf(stderr,"Try '%s --help' for more information\n",argv[0]);
exit(1);
}
- else if (g == -1) return;
+ else if (g == -1) break;
}
+ @<Check the environment for extra settings@>@;
}
@ @<Forward declarations@>=
@@ -34565,6 +34566,19 @@
return ret;
}
+@ If the output directory was specified on the command line,
+we save it in an environment variable so that subbrocesses can
+get the value. If on the other hand the environment specifies
+a directory and the command line does not, save the value from
+the environment to the global variable so that it is used in the
+rest of the code.
+
+@<Check the environment for extra settings@>=
+if (output_directory)
+ xputenv ("TEXMF_OUTPUT_DIRECTORY", output_directory);
+else if (getenv ("TEXMF_OUTPUT_DIRECTORY"))
+ output_directory = getenv ("TEXMF_OUTPUT_DIRECTORY");
+
@*1 Passing a file name as a general text argument.
|scan_file_name| uses the following code to parse a file name given
@@ -35344,7 +35358,7 @@
lt = *localtime(&t);
}
size = strftime(time_str, TIME_STR_SIZE, "D:%Y%m%d%H%M%S", <);
- /* expected format: |"YYYYmmddHHMMSS"| */
+ /* expected format: |"D:YYYYmmddHHMMSS"| */
if (size == 0) {
/* unexpected, contents of |time_str| is undefined */
time_str[0] = '\0';
@@ -35377,7 +35391,7 @@
} else {
off_hours = off / 60;
off_mins = abs(off - off_hours * 60);
- snprintf(&time_str[size], 9, "%+03d'%02d'", off_hours, off_mins);
+ snprintf(&time_str[size], TIME_STR_SIZE-size, "%+03d'%02d'", off_hours, off_mins);
}
}
More information about the tex-live-commits
mailing list.