Commit: 9a532c1800ae4204adf3b0f379ba00b71d4fbf14 - groff-psbb (git)

Demonstration of groff .psbb request handling code, for EPS and PDF input files

Commit MetaInfo

• Revision: 9a532c1800ae4204adf3b0f379ba00b71d4fbf14 (tree)
• Zeit: 2021-10-20 07:48:11
• Autor: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Extend debugging diagnostics to report popped lexer state.

* psbblex.l (DEBUG_POP_STATE): New macro; define, and use it
as a debug-enabled diagnostic wrapper, in place of...
(yy_pop_state): ...this.

Ändern Zusammenfassung

• modified: psbblex.l

Diff

--- a/psbblex.l
+++ b/psbblex.l
@@ -49,8 +49,15 @@
 	 yy_push_state( NAME ); 					\
        } while(0)
 
+# define DEBUG_POP_STATE()						\
+    do { debug_msg("%d: revert to state ", YYSTATE);			\
+	 yy_pop_state(); debug_msg("%d\n", YYSTATE);			\
+       } while(0)
+
 # define DEBUG_RETURN(TOKEN, NAME)					\
-    do { debug_msg("%d: return token %s (%d)\n", YYSTATE, NAME, TOKEN); \
+    do { debug_msg("%d: return token %s (%d)\n",			\
+	     YYSTATE, NAME, TOKEN					\
+	   );								\
 	 return TOKEN;							\
        } while(0)
 
@@ -73,6 +80,7 @@ static void debug_msg (const char *fmt, ...)
 # define DEBUG_ECHO
 # define DEBUG_MSG(ARGLIST)
 # define DEBUG_PUSH_STATE(NAME)  yy_push_state( NAME )
+# define DEBUG_POP_STATE()  yy_pop_state()
 # define DEBUG_RETURN(TOKEN, NAME)  return TOKEN
 # define DEBUG_RETURN_VALUE  return VALUE
 #endif
@@ -86,7 +94,10 @@ enum { PSBB_PHASE_INIT = 0, PSBB_IN_HEADER, PSBB_IN_TRAILER };
 static int psbb_phase, psbb_crescendo_seek( void ), psbb_parse_status;
 
 #define DEBUG_PDFINVOKE(STATE, TOKEN, NAME)				\
-   do { yy_push_state( STATE ); DEBUG_RETURN(TOKEN, NAME);		\
+   do { DEBUG_MSG(("%d: processing entry with key '%s'\n",		\
+	    YYSTATE, yytext						\
+	  ));								\
+        yy_push_state( STATE ); DEBUG_RETURN(TOKEN, NAME);		\
       } while(0)
 
 #define PDFINVOKE(STATE, TOKEN)  DEBUG_PDFINVOKE(STATE, TOKEN, #TOKEN)
@@ -179,7 +190,7 @@ static int pdf_trailer( void )
   * not sufficient here, since we need to be prepared to handle any of
   * the CR only, LF only, or CRLF line ending conventions).
   */
-<SKIP>{READLN}		{ yy_pop_state(); }
+<SKIP>{READLN}		{ DEBUG_POP_STATE(); }
 
 
  /* State: PSHDR
@@ -345,10 +356,12 @@ static int pdf_trailer( void )
 "/Pages"/{PDFSEP}	{ DEBUG_PUSH_STATE( PDFREFER ); }
 "/Kids"/{PDFSEP}	{ DEBUG_PUSH_STATE( PDFALLKIDS ); }
 "/MediaBox"/{PDFSEP}	{ DEBUG_PUSH_STATE( PDFMEDIABOX ); }
-"/"{PDFNAME}/{PDFSEP}	{ DEBUG_MSG(("%d: skipping entry with key '%s'\n", YYSTATE, yytext));
+"/"{PDFNAME}/{PDFSEP}	{ DEBUG_MSG(("%d: skipping entry with key '%s'\n",
+			      YYSTATE, yytext
+			    ));
 			  DEBUG_PUSH_STATE( PDFIGNORE );
 			}
-">>"			{ yy_pop_state(); }
+">>"			{ DEBUG_POP_STATE(); }
 .|\n
 }
 
@@ -365,8 +378,8 @@ static int pdf_trailer( void )
   * object type which we do not expect to encounter.
   */
 <PDFOBJTYPE>{
-"/Catalog"/{PDFSEP}	{ yy_pop_state(); RETURN(PDFOBJREF); }
-"/Page"s?/{PDFSEP}	{ yy_pop_state(); }
+"/Catalog"/{PDFSEP}	{ DEBUG_POP_STATE(); RETURN(PDFOBJREF); }
+"/Page"s?/{PDFSEP}	{ DEBUG_POP_STATE(); }
 "/"{PDFNAME}/{PDFSEP}	{ DEBUG_MSG(("%d: ignoring unknown object type '%s'\n"
 			      "%d: fall back to state 'PDFIGNORE'\n",
 			      YYSTATE, yytext, YYSTATE
@@ -388,7 +401,7 @@ static int pdf_trailer( void )
   */
 <PDFALLKIDS>"["{SEP}*	{ BEGIN PDFKIDS; PDFINVOKE( PDFREFER, PDFOBJREF ); }
 <PDFKIDS,PDFALLKIDS>{
-"]"			{ yy_pop_state(); }
+"]"			{ DEBUG_POP_STATE(); }
 {INTVAL}/{SEP}
 "R"/{PDFSEP}
 {SEP}+
@@ -403,9 +416,9 @@ static int pdf_trailer( void )
   * start condition whence this state was attained.
   */
 <PDFREFER>{
-"R"/{PDFSEP}		{ yy_pop_state(); RETURN('R'); }
+"R"/{PDFSEP}		{ DEBUG_POP_STATE(); RETURN('R'); }
 {INTVAL}/{PDFSEP}	{ yylval = atol( yytext ); RETURN_VALUE; }
-./({EOL}|"/")		{ yy_pop_state(); }
+./({EOL}|"/")		{ DEBUG_POP_STATE(); }
 [ \t\r\n]+
 }
 
@@ -431,7 +444,7 @@ static int pdf_trailer( void )
 <PDFMEDIABOXEVAL>{
 {FLOATVAL}/{PDFSEP}	{ yylval = lround( atof( yytext )); RETURN_VALUE; }
 {INTVAL}/{PDFSEP}	{ yylval = atol( yytext ); RETURN_VALUE; }
-"]"			{ yy_pop_state(); }
+"]"			{ DEBUG_POP_STATE(); }
 {SEP}+
 }
 
@@ -442,7 +455,9 @@ static int pdf_trailer( void )
   * revert to the state whence this condition was invoked.
   */
 <PDFEVAL>{
-{INTVAL}/{PDFSEP}	{ yylval = atol( yytext ); yy_pop_state(); RETURN_VALUE; }
+{INTVAL}/{PDFSEP}	{ yylval = atol( yytext ); DEBUG_POP_STATE();
+			  RETURN_VALUE;
+			}
 [ \t\r\n]+
 }
 
@@ -454,8 +469,8 @@ static int pdf_trailer( void )
 <PDFIGNORE>{
 [^</>\r\n]+		{ DEBUG_ECHO; }
 "<<"			{ DEBUG_PUSH_STATE( PDFDICT ); }
-[</>]			{ yyless(0); yy_pop_state(); }
-{EOL}			{ yy_pop_state(); }
+[</>]			{ yyless(0); DEBUG_POP_STATE(); }
+{EOL}			{ DEBUG_POP_STATE(); }
 }
 
  /* State: PDFXREF
@@ -533,13 +548,18 @@ static int pdf_trailer( void )
   * specified object;
   */
 <PDFGOXREF>{READLN}	{ long offset, gen; char disp;
-			  sscanf( yytext, "%10ld %5ld %c", &offset, &gen, &disp );
-			  DEBUG_MSG(("%d: %.18s --> %d; %d %c\n", YYSTATE, yytext, offset, gen, disp));
+			  sscanf( yytext, "%10ld %5ld %c",
+			      &offset, &gen, &disp
+			    );
+			  DEBUG_MSG(("%d: %.18s --> %d; %d %c\n",
+			      YYSTATE, yytext, offset, gen, disp
+			    ));
 			  if( disp == 'n' && gen == ref[1] )
 			  { pdfseek( offset ); BEGIN PDFGETOBJECT;
 			  }
 			  else
-			  { yyerror( "index entry '%.18s' unexpected in file '%s'",
+			  { yyerror(
+			       	"index entry '%.18s' unexpected in file '%s'",
 			        yytext, psbb_input_file
 			      );
 			    return PSBB_PARSE_FAILURE;