Stephen Roantree
50bcbc2271
Merge branch 'master' of https://github.com/stedolan/jq into contains-operator
...
Conflicts:
lexer.gen.c
parser.gen.c
parser.gen.h
parser.gen.info
parser.y
2012-10-25 10:02:02 -07:00
Stephen Dolan
72691b4909
Fix a bug in string parsing. Closes #35
2012-10-25 00:13:39 +01:00
Stephen Roantree
5e25c2a259
Implemented contains operator
2012-10-24 13:50:26 -07:00
Damian Gryski
e40778727b
Replace yyscan_t with another pointer type that we control.
...
This prevents the circuluar dependency between parser.gen.h and
lexer.gen.h. Newer versions of bison add a prototype for yyparse() to
parser.gen.h that include the as-yet-undeclared yyscan_t type.
2012-10-24 09:28:27 +02:00
Damian Gryski
553de39b2a
Implement 'not equal' (!=) as a binop
2012-10-23 17:01:39 +02:00
Damian Gryski
b193bca563
yyscan_t isn't exposed by some versions of flex.
2012-10-23 17:00:42 +02:00
Stephen Dolan
afec2544f1
A string interpolation syntax that I don't hate. Also tests.
...
You can interpolate values into strings using \(this syntax), e.g.
"best \("str" + "ing") ever"
2012-10-20 00:09:20 +01:00
Stephen Roantree
b3557429eb
Make comp binops nonassoc
2012-10-10 23:00:24 +01:00
Stephen Roantree
0618e61e0b
Add <,>,<=,>= binops
2012-10-07 22:34:12 +01:00
Stephen Dolan
a4eea165bb
Move everything around - delete old Haskell code, clean up build.
2012-09-18 17:44:43 +01:00
Stephen Roantree