diff options
| -rw-r--r-- | lib/pure/json.nim | 25 | ||||
| -rw-r--r-- | lib/system/assign.nim | 6 |
2 files changed, 14 insertions, 17 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim index ed560d7e4..2c2b6500f 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -1111,11 +1111,11 @@ proc processObjField(field, jsonNode: NimNode): seq[NimNode] = exprColonExpr.add(createConstructor(typeNode, indexedJsonNode)) of nnkRecCase: # A "case" field that introduces a variant. - let exprColonExpr = newNimNode(nnkExprColonExpr) - result.add(exprColonExpr) + let exprEqExpr = newNimNode(nnkExprEqExpr) + result.add(exprEqExpr) # Add the "case" field name (usually "kind"). - exprColonExpr.add(toIdentNode(field[0])) + exprEqExpr.add(toIdentNode(field[0])) # -> jsonNode["`field[0]`"] let kindJsonNode = createJsonIndexer(jsonNode, $field[0]) @@ -1125,7 +1125,7 @@ proc processObjField(field, jsonNode: NimNode): seq[NimNode] = let getEnumSym = bindSym("getEnum") let astStrLit = toStrLit(kindJsonNode) let getEnumCall = newCall(getEnumSym, kindJsonNode, astStrLit, kindType) - exprColonExpr.add(getEnumCall) + exprEqExpr.add(getEnumCall) # Iterate through each `of` branch. for i in 1 ..< field.len: @@ -1475,20 +1475,18 @@ proc postProcess(node: NimNode): NimNode = # TODO: Placing `node[0]` inside quote is buggy var resType = toIdentNode(node[0]) - result.add( - quote do: - var `resIdent` = `resType`(); - ) + var objConstr = newTree(nnkObjConstr, resType) + result.add newVarStmt(resIdent, objConstr) # Process each ExprColonExpr. for i in 1..<len(node): - result.add postProcessExprColonExpr(node[i], resIdent) + if node[i].kind == nnkExprEqExpr: + objConstr.add newTree(nnkExprColonExpr, node[i][0], node[i][1]) + else: + result.add postProcessExprColonExpr(node[i], resIdent) # Return the `res` variable. - result.add( - quote do: - `resIdent` - ) + result.add(resIdent) macro to*(node: JsonNode, T: typedesc): untyped = @@ -1539,7 +1537,6 @@ macro to*(node: JsonNode, T: typedesc): untyped = let `temp` = `node` let constructor = createConstructor(typeNode[1], temp) - # TODO: Rename postProcessValue and move it (?) result.add(postProcessValue(constructor)) # echo(treeRepr(result)) diff --git a/lib/system/assign.nim b/lib/system/assign.nim index fd6a0ac56..e5ca1637c 100644 --- a/lib/system/assign.nim +++ b/lib/system/assign.nim @@ -224,14 +224,14 @@ proc selectBranch(discVal, L: int, a: ptr array[0x7fff, ptr TNimNode]): ptr TNimNode = result = a[L] # a[L] contains the ``else`` part (but may be nil) if discVal <% L: - var x = a[discVal] + let x = a[discVal] if x != nil: result = x proc FieldDiscriminantCheck(oldDiscVal, newDiscVal: int, a: ptr array[0x7fff, ptr TNimNode], L: int) {.compilerProc.} = - var oldBranch = selectBranch(oldDiscVal, L, a) - var newBranch = selectBranch(newDiscVal, L, a) + let oldBranch = selectBranch(oldDiscVal, L, a) + let newBranch = selectBranch(newDiscVal, L, a) when defined(nimOldCaseObjects): if newBranch != oldBranch and oldDiscVal != 0: sysFatal(FieldError, "assignment to discriminant changes object branch") |