*** empty log message ***

Fri, 28 Dec 2001 16:04:15 +0000

author
eric
date
Fri, 28 Dec 2001 16:04:15 +0000
changeset 8
7288d2753c18
parent 7
e1f52aa9f252
child 9
de78038d990f

*** empty log message ***

parser.y file | annotate | diff | revisions
scanner.l file | annotate | diff | revisions
     1.1 --- a/parser.y	Fri Dec 28 04:55:47 2001 +0000
     1.2 +++ b/parser.y	Fri Dec 28 16:04:15 2001 +0000
     1.3 @@ -26,6 +26,7 @@
     1.4  %token INPUT
     1.5  
     1.6  %token PAGE
     1.7 +%token PAGES
     1.8  %token BOOKMARK
     1.9  %token OUTPUT
    1.10  
    1.11 @@ -81,17 +82,22 @@
    1.12  	'{' input_clauses '}' ;
    1.13  
    1.14  input_statement:
    1.15 -	INPUT input_clause ;
    1.16 +	INPUT input_clauses ;
    1.17  
    1.18  page_clause:
    1.19 -	PAGE ranges ';'
    1.20 -	| PAGE ranges ',' STRING ';' ;
    1.21 +	PAGE INTEGER ';'
    1.22 +	| PAGE INTEGER ',' STRING ';' ;
    1.23 +
    1.24 +pages_clause:
    1.25 +	PAGES ranges ';'
    1.26 +	| PAGES ranges ',' STRING ';' ;
    1.27  
    1.28  bookmark_clause:
    1.29 -	BOOKMARK STRING ';' ;
    1.30 +	BOOKMARK INTEGER ',' STRING ';'
    1.31 +	| BOOKMARK STRING ';' ;
    1.32  
    1.33  output_clause:
    1.34 -	page_clause | bookmark_clause
    1.35 +	page_clause | pages_clause | bookmark_clause
    1.36  	| output_clause_list ;
    1.37  
    1.38  output_clauses:
    1.39 @@ -102,5 +108,4 @@
    1.40  	'{' output_clauses '}' ;
    1.41  
    1.42  output_statement:
    1.43 -	OUTPUT output_clause ;
    1.44 -
    1.45 +	OUTPUT output_clauses ;
     2.1 --- a/scanner.l	Fri Dec 28 04:55:47 2001 +0000
     2.2 +++ b/scanner.l	Fri Dec 28 16:04:15 2001 +0000
     2.3 @@ -25,6 +25,7 @@
     2.4  odd		{ return (ODD); }
     2.5  output		{ return (OUTPUT); }
     2.6  page		{ return (PAGE); }
     2.7 +pages		{ return (PAGES); }
     2.8  rotate		{ return (ROTATE); }
     2.9  size		{ return (SIZE); }
    2.10