diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-07-27 17:41:55 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 10:37:10 -0500 |
| commit | c7a3f25200c8692e969f21c7f2555630ec0d0d30 (patch) | |
| tree | 0459696448aa85b4bf8144cea1fa6385bca35c6b /tests | |
| parent | 4f193e34c6c41abdd06c134e584312077def2bda (diff) | |
| download | qemu-c7a3f25200c8692e969f21c7f2555630ec0d0d30.zip qemu-c7a3f25200c8692e969f21c7f2555630ec0d0d30.tar.gz qemu-c7a3f25200c8692e969f21c7f2555630ec0d0d30.tar.bz2 | |
qapi.py: Restructure lexer and parser
The parser has a rather unorthodox structure:
Until EOF:
Read a section:
Generator function get_expr() yields one section after the
other, as a string. An unindented, non-empty line that
isn't a comment starts a new section.
Lexing:
Split section into a list of tokens (strings), with help
of generator function tokenize().
Parsing:
Parse the first expression from the list of tokens, with
parse(), throw away any remaining tokens.
In parse_schema(): record value of an enum, union or
struct key (if any) in the appropriate global table,
append expression to the list of expressions.
Return list of expressions.
Known issues:
(1) Indentation is significant, unlike in real JSON.
(2) Neither lexer nor parser have any idea of source positions. Error
reporting is hard, let's go shopping.
(3) The one error we bother to detect, we "report" via raise.
(4) The lexer silently ignores invalid characters.
(5) If everything in a section gets ignored, the parser crashes.
(6) The lexer treats a string containing a structural character exactly
like the structural character.
(7) Tokens trailing the first expression in a section are silently
ignored.
(8) The parser accepts any token in place of a colon.
(9) The parser treats comma as optional.
(10) parse() crashes on unexpected EOF.
(11) parse_schema() crashes when a section's expression isn't a JSON
object.
Replace this piece of original art by a thoroughly unoriginal design.
Takes care of (1), (2), (5), (6) and (7), and lays the groundwork for
addressing the others. Generated source files remain unchanged.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1374939721-7876-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/indented-expr.out | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-colon.out | 4 | ||||
| -rw-r--r-- | tests/qapi-schema/quoted-structural-chars.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/quoted-structural-chars.exit | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/quoted-structural-chars.out | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/tests/qapi-schema/indented-expr.out b/tests/qapi-schema/indented-expr.out index 98ae692..98af89a 100644 --- a/tests/qapi-schema/indented-expr.out +++ b/tests/qapi-schema/indented-expr.out @@ -1,3 +1,3 @@ -[OrderedDict([('id', 'eins')])] +[OrderedDict([('id', 'eins')]), OrderedDict([('id', 'zwei')])] [] [] diff --git a/tests/qapi-schema/missing-colon.out b/tests/qapi-schema/missing-colon.out index 50f827e..e67068c 100644 --- a/tests/qapi-schema/missing-colon.out +++ b/tests/qapi-schema/missing-colon.out @@ -1,3 +1,3 @@ -[OrderedDict([('enum', ','), ('data', ['good', 'bad', 'ugly'])])] -[','] +[OrderedDict([('enum', None), ('data', ['good', 'bad', 'ugly'])])] +[None] [] diff --git a/tests/qapi-schema/quoted-structural-chars.err b/tests/qapi-schema/quoted-structural-chars.err index e69de29..48c849d 100644 --- a/tests/qapi-schema/quoted-structural-chars.err +++ b/tests/qapi-schema/quoted-structural-chars.err @@ -0,0 +1 @@ +Crashed: <type 'exceptions.AttributeError'> diff --git a/tests/qapi-schema/quoted-structural-chars.exit b/tests/qapi-schema/quoted-structural-chars.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/quoted-structural-chars.exit +++ b/tests/qapi-schema/quoted-structural-chars.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/quoted-structural-chars.out b/tests/qapi-schema/quoted-structural-chars.out index 85405be..e69de29 100644 --- a/tests/qapi-schema/quoted-structural-chars.out +++ b/tests/qapi-schema/quoted-structural-chars.out @@ -1,3 +0,0 @@ -[OrderedDict([('key1', 'value1'), ('key2', [])])] -[] -[] |