1
Fork 0

rename ValueExpr to ScalarExpr

This commit is contained in:
Jake Wheat 2016-02-22 23:24:25 +02:00
parent 09223c3de9
commit a2645ace3f
15 changed files with 418 additions and 413 deletions

View file

@ -17,7 +17,7 @@ Converts the test data to asciidoc
> doc n (Group nm is) =
> Heading n nm
> : concatMap (doc (n + 1)) is
> doc _ (TestValueExpr _ str e) =
> doc _ (TestScalarExpr _ str e) =
> [Row str (ppShow e)]
> doc _ (TestQueryExpr _ str e) =
> [Row str (ppShow e)]
@ -29,8 +29,8 @@ Converts the test data to asciidoc
> [Row str (ppShow $ parseQueryExpr d "" Nothing str)]
> doc _ (ParseQueryExprFails d str) =
> [Row str (ppShow $ parseQueryExpr d "" Nothing str)]
> doc _ (ParseValueExprFails d str) =
> [Row str (ppShow $ parseValueExpr d "" Nothing str)]
> doc _ (ParseScalarExprFails d str) =
> [Row str (ppShow $ parseScalarExpr d "" Nothing str)]
> doc _ (LexTest d str t) =
> [Row str (ppShow $ lexSQL d "" Nothing str)]

View file

@ -56,7 +56,7 @@ link:https://github.com/JakeWheat/intro_to_parsing/blob/master/SimpleSQLQueryPar
** offset and fetch
** set operators
** common table expressions
** wide range of value expressions
** wide range of scalar expressions
* DDL
** TODO
* non-query DML

View file

@ -28,7 +28,7 @@ get the best parser error messages possible.
=== Select lists
Supports value expressions, aliases with optional 'as'.
Supports scalar expressions, aliases with optional 'as'.
Doesn't support 'select * as (a,b,c) from t' yet.
@ -52,12 +52,12 @@ Supports 'select distinct' and explicit 'select all'.
=== Group by clause
Supports value expressions, group by (), cube, rollup, grouping
Supports scalar expressions, group by (), cube, rollup, grouping
parentheses and grouping sets with nested grouping expressions.
=== Order by clause
Supports value expressions, asc/desc and nulls first/last.
Supports scalar expressions, asc/desc and nulls first/last.
=== Offset and fetch
@ -75,9 +75,9 @@ For example: values (1,2),(3,4).
For example: 'table t', which is shorthand for 'select * from t'.
=== Value expressions
=== Scalar expressions
The value expressions type and parser is used in many contexts,
The scalar expressions type and parser is used in many contexts,
including:
* select lists;
@ -91,7 +91,7 @@ including:
This doesn't exactly follow the ANSI Standards, which have separate
grammars for most of these.
The supported value expressions include:
The supported scalar expressions include:
* basic string literals in single quotes
* number literals: digits.digitse+-exp