mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-17 07:07:41 +00:00
qapi: Allow true, false and null in schema json
In the near term, we will use it for a sensible-looking 'gen':false inside command declarations, instead of the current ugly 'gen':'no'. In the long term, it will allow conversion from shorthand with defaults mentioned only in side-band documentation: 'data':{'*flag':'bool', '*string':'str'} into an explicit default value documentation, as in: 'data':{'flag':{'type':'bool', 'optional':true, 'default':true}, 'string':{'type':'str', 'optional':true, 'default':null}} We still don't parse integer values (also necessary before we can allow explicit defaults), but that can come in a later series. Backports commit e53188ada516c814a729551be2448684d6d8ce08 from qemu
This commit is contained in:
parent
b19cd2bd9a
commit
1f9419be44
|
@ -158,6 +158,20 @@ class QAPISchema:
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
string += ch
|
string += ch
|
||||||
|
elif self.tok in "tfn":
|
||||||
|
val = self.src[self.cursor - 1:]
|
||||||
|
if val.startswith("true"):
|
||||||
|
self.val = True
|
||||||
|
self.cursor += 3
|
||||||
|
return
|
||||||
|
elif val.startswith("false"):
|
||||||
|
self.val = False
|
||||||
|
self.cursor += 4
|
||||||
|
return
|
||||||
|
elif val.startswith("null"):
|
||||||
|
self.val = None
|
||||||
|
self.cursor += 3
|
||||||
|
return
|
||||||
elif self.tok == '\n':
|
elif self.tok == '\n':
|
||||||
if self.cursor == len(self.src):
|
if self.cursor == len(self.src):
|
||||||
self.tok = None
|
self.tok = None
|
||||||
|
@ -197,8 +211,9 @@ class QAPISchema:
|
||||||
if self.tok == ']':
|
if self.tok == ']':
|
||||||
self.accept()
|
self.accept()
|
||||||
return expr
|
return expr
|
||||||
if not self.tok in [ '{', '[', "'" ]:
|
if not self.tok in "{['tfn":
|
||||||
raise QAPISchemaError(self, 'Expected "{", "[", "]" or string')
|
raise QAPISchemaError(self, 'Expected "{", "[", "]", string, '
|
||||||
|
'boolean or "null"')
|
||||||
while True:
|
while True:
|
||||||
expr.append(self.get_expr(True))
|
expr.append(self.get_expr(True))
|
||||||
if self.tok == ']':
|
if self.tok == ']':
|
||||||
|
@ -217,7 +232,7 @@ class QAPISchema:
|
||||||
elif self.tok == '[':
|
elif self.tok == '[':
|
||||||
self.accept()
|
self.accept()
|
||||||
expr = self.get_values()
|
expr = self.get_values()
|
||||||
elif self.tok == "'":
|
elif self.tok in "'tfn":
|
||||||
expr = self.val
|
expr = self.val
|
||||||
self.accept()
|
self.accept()
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue