cleaned up parser.y warnings

fizx · Mar 9, 2009 · e22f309 · e22f309
1 parent 262584b
commit e22f309
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 62 deletions.
diff --git a/config.status b/config.status
@@ -359,8 +359,8 @@ gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='/Users/kyle/Git/parsley'
 srcdir='.'
-INSTALL='/usr/bin/install -c'
-MKDIR_P='./install-sh -c -d'
+INSTALL='/opt/local/bin/ginstall -c'
+MKDIR_P='/opt/local/bin/gmkdir -p'
 AWK='awk'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -696,7 +696,7 @@ echo 'BEGIN {' >"$tmp/subs1.awk" &&
 cat >>"$tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["XSLT_CONFIG"]="/opt/local/bin/xslt-config"
+S["XSLT_CONFIG"]="/usr/bin/xslt-config"
 S["XML2_CONFIG"]="/opt/local/bin/xml2-config"
 S["CPP"]="gcc -std=gnu99 -E"
 S["OTOOL64"]=":"
@@ -743,7 +743,7 @@ S["DEPDIR"]=".deps"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CC"]="gcc"
-S["CPPFLAGS"]=" -I/opt/local/include -I/opt/local/include/libxml2 -I/opt/local/include -I/opt/local/include/libxml2"
+S["CPPFLAGS"]=" -I/opt/local/include -I/opt/local/include/libxml2 -I/opt/local/include/libxml2"
 S["LDFLAGS"]=" -L/opt/local/lib"
 S["CFLAGS"]="-g -O2"
 S["CC"]="gcc -std=gnu99"
@@ -753,8 +753,8 @@ S["AMTAR"]="${SHELL} /Users/kyle/Git/parsley/missing --run tar"
 S["am__leading_dot"]="."
 S["SET_MAKE"]=""
 S["AWK"]="awk"
-S["mkdir_p"]="$(top_builddir)/./install-sh -c -d"
-S["MKDIR_P"]="./install-sh -c -d"
+S["mkdir_p"]="/opt/local/bin/gmkdir -p"
+S["MKDIR_P"]="/opt/local/bin/gmkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]="strip"
 S["install_sh"]="$(SHELL) /Users/kyle/Git/parsley/install-sh"
@@ -773,8 +773,7 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lexslt -lxml2 -lxslt -ljson -largp -lpcre  -L/opt/local/lib -lxml2 -lz -lpthread -liconv -lm -L/opt/local/lib -lxslt -lxml2 -lz -lpthread -liconv -"\
-"lm"
+S["LIBS"]="-lexslt -lxml2 -lxslt -ljson -largp -lpcre  -L/opt/local/lib -lxml2 -lz -lpthread -liconv -lm -L/usr/lib -lxslt -lxml2 -lz -lpthread -licucore -lm"
 S["ECHO_T"]=""
 S["ECHO_N"]=""
 S["ECHO_C"]="\\c"

diff --git a/libtool b/libtool
@@ -2,7 +2,7 @@
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (parsleyc) 1.0
-# Libtool was configured on host kyle-maxwells-macbook.local:
+# Libtool was configured on host 111.flood.pivotallabs.com:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

diff --git a/parser.y b/parser.y
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "kstring.h"
+#include "parsed_xpath.h"
 #include <libxml/hash.h>
 
 #ifndef PARSER_Y_H_INCLUDED
@@ -170,16 +171,13 @@ void answer(char*);
 %type <string> AdditiveExpr
 %type <string> MultiplicativeExpr
 %type <string> UnaryExpr
-%type <string> ExprToken
 %type <string> Literal
 %type <string> Number
-%type <string> Operator
-%type <string> OperatorName
+%type <string> simple_selector_anchor
 %type <string> MultiplyOperator
 %type <string> VariableReference
 %type <string> NameTest
 %type <string> NodeType
-%type <string> ExprWhitespace
 %type <string> UnprefixedName
 %type <string> combinator
 %type <string> possibly_empty_sequence
@@ -364,26 +362,6 @@ UnaryExpr
 	| DASH UnaryExpr		{ $$ = astrcat($1, $2); }
 	;
 
-ExprToken
-  : LPAREN
-	| RPAREN
-	| LBRA
-	| RBRA
-	| DOT
-	| DBLDOT
-	| AT
-	| COMMA
-	| DBLCOLON
-	| NameTest 
-	| NodeType 
-	| Operator 
-	| FunctionName
-	| AxisName 
-	| Literal 
-	| Number 
-	| VariableReference
-	;
-
 Literal
   : STRING
 	;
@@ -394,29 +372,6 @@ Number
 	| DOT NUMBER						{ $$ = astrcat($1, $2); }
 	;
 
-Operator
-  : OperatorName 
-	| MultiplyOperator 
-	| SLASH
-	| DBLSLASH
-	| PIPE
-	| PLUS
-	| DASH
-	| EQ
-	| CXOPNE
-	| LT
-	| LTE
-	| GT 
-	| GTE
-	;
-
-OperatorName
-  : XAND 
-	| XOR 
-	| XMOD 
-	| XDIV
-	;
-
 MultiplyOperator
   : SPLAT
 	;
@@ -437,9 +392,6 @@ NodeType
 	| XNODE
 	;
 
-ExprWhitespace
-  : S
-
 FunctionName
   : QName
 	;

diff --git a/y.tab.h b/y.tab.h
@@ -147,6 +147,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "kstring.h"
+#include "parsed_xpath.h"
 #include <libxml/hash.h>
 
 #ifndef PARSER_Y_H_INCLUDED
@@ -176,12 +177,12 @@ void answer(char*);
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE 
-#line 38 "parser.y"
+#line 39 "parser.y"
 {
 	char* string;
 }
-/* Line 2616 of glr.c.  */
-#line 185 "y.tab.h"
+/* Line 2604 of glr.c.  */
+#line 186 "y.tab.h"
 	YYSTYPE;
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1