Optional default tag for union type #227
Conversation
nellaG
added
typ:enhance
src/Nirum/Targets/Python.hs
Outdated
| @@ -1098,7 +1107,7 @@ class $className(service_type): | |||
| $methodNameMap | |||
| ]) | |||
| __nirum_method_annotations__ = $methodAnnotations' | |||
|
|
|||
| __valerie__ = True | |||
kanghyojun
force-pushed
the
default-tag-for-union
branch
from
7bd4220 to
02bbdff
Compare
Checklist 🤔
|
|
👍 |
src/Nirum/Parser.hs
Outdated
| tag = do | ||
| annotationSet' <- annotationSet <?> "union tag annotations" | ||
| spaces | ||
| -- CHECK: If a new reserved keyword is introduced, it has to be also | ||
| -- added to `reservedKeywords` set in the `Nirum.Constructs.Identifier` | ||
| -- module. |
There was a problem hiding this comment.
This check comment should go to the top of Parser.hs source. See also Checkmate docs. Since it's sensitive to block indentation levels, if a CHECK comment is too deeply inside it could be hardly warned.
src/Nirum/Targets/Python.hs
Outdated
| @@ -1104,36 +1121,33 @@ class $className({T.intercalate "," $ compileExtendClasses annotations}): | |||
| else: | |||
| name = attribute_name | |||
| tag_types = cls.__nirum_tag_types__ | |||
| if callable(tag_types): # old compiler could generate non-callable map | |||
| # old compiler could generate non-callable map | |||
| if callable(tag_types): | |||
| tag_types = dict(tag_types()) | |||
| try: | |||
| args[name] = deserialize_meta(tag_types[name], item) | |||
There was a problem hiding this comment.
Despite this kind of conditionals are necessary for the runtime library to be compatible old and new versions of the compiler, it's no more needed for compiler-generated codes; it's guaranteed that it's always generated by the new one.
src/Nirum/Targets/Python.hs
Outdated
| @@ -200,6 +207,9 @@ runCodeGen :: CodeGen a | |||
| -> (Either CompileError' a, CodeGenContext) | |||
| runCodeGen = C.runCodeGen | |||
|
|
|||
| renderCompileText :: BI.Markup -> T.Text | |||
| renderCompileText = toStrict . renderMarkup | |||
There was a problem hiding this comment.
These toStrict $ renderMarkup ... codes have remained by intention; they need to be merely removed in the near future by replacing type CompileResult Python = Code with type CompileResult Python = BI.Markup.
src/Nirum/Targets/Python.hs
Outdated
| @@ -1007,17 +1018,10 @@ class $className(object): | |||
| ] | |||
| compileTypeDeclaration src | |||
| d@TypeDeclaration { typename = typename' | |||
| , type' = UnionType tags | |||
| , type' = u | |||
There was a problem hiding this comment.
We don't need to define tags like the following code in where clause:
tags :: [Tag]
tags = findTags uInstead we can just match both of UnionType and its tags:
, type' = u@(UnionType tags)Also we should rename u to better one.
src/Nirum/Targets/Python.hs
Outdated
| {arg "cls" "type"}, value | ||
| ){ ret className }: | ||
| #{arg "cls" "type"}, value | ||
| )#{ ret className }: |
There was a problem hiding this comment.
Since we now have proper conditionals through Heterocephalus, things like arg "cls" "type" or ret className can be avoided. See also compileTypeDeclaration function for EnumType:
@classmethod
%{ case pyVer }
%{ of Python2 }
def __nirum_deserialize__(cls, value):
%{ of Python3 }
def __nirum_deserialize__(cls: type, value: str) -> '#{className}':
%{ endcase }
return cls(value.replace('-', '_')) # FIXME: validate input
dahlia
force-pushed
the
master
branch
13 times, most recently
from
7d5a611 to
12a5ff2
Compare
kanghyojun
force-pushed
the
default-tag-for-union
branch
from
2e79dd0 to
87d7f5e
Compare
|
👏 |
implements #13 .