git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update readme on build system
[lunaix-os.git]
/
lunaix-os
/
scripts
/
build-tools
/
lcfg2
/
rules.py
diff --git
a/lunaix-os/scripts/build-tools/lcfg2/rules.py
b/lunaix-os/scripts/build-tools/lcfg2/rules.py
index 35f770f8e494d085f8a8bc094f1d6e5f18f50d03..0297b554c874139be8d072eaa86db8bcb33eedb6 100644
(file)
--- a/
lunaix-os/scripts/build-tools/lcfg2/rules.py
+++ b/
lunaix-os/scripts/build-tools/lcfg2/rules.py
@@
-9,21
+9,15
@@
class SyntaxRule(RuleCollection):
ctx=ast.Store)
TrivialValue = Schema(Schema.Union(
ast.Constant,
ctx=ast.Store)
TrivialValue = Schema(Schema.Union(
ast.Constant,
- ast.Name,
- Schema(ast.Subscript,
- value=Schema(ast.Name, id='__lzLut__'),
- slice=ast.Constant)
+ ast.Name
))
BoolOperators = Schema(Schema.Union(ast.Or, ast.And))
TrivialTest = Schema(ast.Compare,
left=TrivialValue,
))
BoolOperators = Schema(Schema.Union(ast.Or, ast.And))
TrivialTest = Schema(ast.Compare,
left=TrivialValue,
- ops=[Schema.Union(ast.Eq, ast.In)],
- comparators=[Schema.Union(
- ast.Constant,
- Schema(ast.List, elts=Schema.List(ast.Constant))
- )])
+ ops=[Schema.Union(ast.Eq)],
+ comparators=[ast.Constant])
InlineIf = Schema(ast.IfExp,
test=Schema.Union(TrivialTest, TrivialValue),
InlineIf = Schema(ast.IfExp,
test=Schema.Union(TrivialTest, TrivialValue),
@@
-38,8
+32,8
@@
class SyntaxRule(RuleCollection):
TrivialReturn = Schema(Schema.Union(
TrivialValue,
TrivialReturn = Schema(Schema.Union(
TrivialValue,
+ TrivialTest,
InlineIf,
InlineIf,
- TrivialLogic,
ast.JoinedStr
))
ast.JoinedStr
))