[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] do not require lookahead for escapes too
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH] do not require lookahead for escapes too |
Date: |
Fri, 21 May 2010 12:10:09 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
json-lexer.c | 21 ++++++++-------------
roms/seabios | 2 +-
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/json-lexer.c b/json-lexer.c
index b9250c1..bc9dfae 100644
--- a/json-lexer.c
+++ b/json-lexer.c
@@ -56,7 +56,6 @@ enum json_lexer_state {
IN_ESCAPE_I,
IN_ESCAPE_I6,
IN_ESCAPE_I64,
- IN_ESCAPE_DONE,
IN_WHITESPACE,
IN_START,
};
@@ -208,21 +207,17 @@ static const uint8_t json_lexer[][256] = {
},
/* escape */
- [IN_ESCAPE_DONE] = {
- TERMINAL(JSON_ESCAPE),
- },
-
[IN_ESCAPE_LL] = {
- ['d'] = IN_ESCAPE_DONE,
+ ['d'] = JSON_ESCAPE,
},
[IN_ESCAPE_L] = {
- ['d'] = IN_ESCAPE_DONE,
+ ['d'] = JSON_ESCAPE,
['l'] = IN_ESCAPE_LL,
},
[IN_ESCAPE_I64] = {
- ['d'] = IN_ESCAPE_DONE,
+ ['d'] = JSON_ESCAPE,
},
[IN_ESCAPE_I6] = {
@@ -234,11 +229,11 @@ static const uint8_t json_lexer[][256] = {
},
[IN_ESCAPE] = {
- ['d'] = IN_ESCAPE_DONE,
- ['i'] = IN_ESCAPE_DONE,
- ['p'] = IN_ESCAPE_DONE,
- ['s'] = IN_ESCAPE_DONE,
- ['f'] = IN_ESCAPE_DONE,
+ ['d'] = JSON_ESCAPE,
+ ['i'] = JSON_ESCAPE,
+ ['p'] = JSON_ESCAPE,
+ ['s'] = JSON_ESCAPE,
+ ['f'] = JSON_ESCAPE,
['l'] = IN_ESCAPE_L,
['I'] = IN_ESCAPE_I,
},
diff --git a/roms/seabios b/roms/seabios
index 7d09d0e..8f469b9 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 7d09d0e3ba11310e973d4302c7fcc3fc2184e04c
+Subproject commit 8f469b9676127ba6bb52609d89ec774e61db0ee1
--
1.6.6.1
- [Qemu-devel] [PATCH 6/6] json-streamer: Don't use qdict_put_obj(), (continued)
- [Qemu-devel] [PATCH 6/6] json-streamer: Don't use qdict_put_obj(), Luiz Capitulino, 2010/05/19
- [Qemu-devel] [PATCH 5/6] json-lexer: Drop 'buf', Luiz Capitulino, 2010/05/19
- Re: [Qemu-devel] [PATCH 0/6]: QMP: Fix issues in parser/lexer, Anthony Liguori, 2010/05/19
- Re: [Qemu-devel] [PATCH 0/6]: QMP: Fix issues in parser/lexer, Luiz Capitulino, 2010/05/20
- [Qemu-devel] Re: [PATCH 0/6]: QMP: Fix issues in parser/lexer, Paolo Bonzini, 2010/05/20
- [Qemu-devel] Re: [PATCH 0/6]: QMP: Fix issues in parser/lexer, Luiz Capitulino, 2010/05/20
- [Qemu-devel] Re: [PATCH 0/6]: QMP: Fix issues in parser/lexer, Anthony Liguori, 2010/05/20
- [Qemu-devel] Re: [PATCH 0/6]: QMP: Fix issues in parser/lexer, Luiz Capitulino, 2010/05/20
- [Qemu-devel] [PATCH] do not require lookahead in json-lexer.c if not necessary, Paolo Bonzini, 2010/05/21
- [Qemu-devel] [PATCH] do not require lookahead for escapes too,
Paolo Bonzini <=
- [Qemu-devel] Re: [PATCH] do not require lookahead for escapes too, Paolo Bonzini, 2010/05/23
Re: [Qemu-devel] [PATCH 0/6]: QMP: Fix issues in parser/lexer, Avi Kivity, 2010/05/20