Skip to content

Remove deprecated ident type, getNum -> getInt #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v1.2.6
Choose a base branch
from
Open

Remove deprecated ident type, getNum -> getInt #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Chapter9/configurator/configurator.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import macros
import std/[macros, json]

proc createRefType(ident: NimIdent, identDefs: seq[NimNode]): NimNode =
proc createRefType(ident: string, identDefs: seq[NimNode]): NimNode =
result = newTree(nnkTypeSection,
newTree(nnkTypeDef,
newIdentNode(ident),
Expand Down Expand Up @@ -29,7 +29,7 @@ template constructor(ident: untyped): untyped =
proc `new ident`(): `ident` =
new result

proc createLoadProc(typeName: NimIdent, identDefs: seq[NimNode]): NimNode =
proc createLoadProc(typeName: string, identDefs: seq[NimNode]): NimNode =
var cfgIdent = newIdentNode("cfg")
var filenameIdent = newIdentNode("filename")
var objIdent = newIdentNode("obj")
Expand All @@ -40,14 +40,14 @@ proc createLoadProc(typeName: NimIdent, identDefs: seq[NimNode]): NimNode =

for identDef in identDefs:
let fieldNameIdent = identDef[0]
let fieldName = $fieldNameIdent.ident
case $identDef[1].ident
let fieldName = $fieldNameIdent.strVal
case $identDef[1].strVal
of "string":
body.add quote do:
`cfgIdent`.`fieldNameIdent` = `objIdent`[`fieldName`].getStr
of "int":
body.add quote do:
`cfgIdent`.`fieldNameIdent` = `objIdent`[`fieldName`].getNum().int
`cfgIdent`.`fieldNameIdent` = `objIdent`[`fieldName`].getInt().int
else:
doAssert(false, "Not Implemented")

Expand All @@ -61,22 +61,22 @@ macro config*(typeName: untyped, fields: untyped): untyped =
result = newStmtList()

let identDefs = toIdentDefs(fields)
result.add createRefType(typeName.ident, identDefs)
result.add getAst(constructor(typeName.ident))
result.add createLoadProc(typeName.ident, identDefs)
result.add createRefType(typeName.strVal, identDefs)
result.add getAst(constructor(typeName))
result.add createLoadProc(typeName.strVal, identDefs)

echo treeRepr(typeName)
echo treeRepr(fields)

echo treeRepr(result)
echo repr(result)

import json
config MyAppConfig:
address: string
port: int
when isMainModule:
config MyAppConfig:
address: string
port: int

var myConf = newMyAppConfig()
myConf.load("myappconfig.cfg")
echo("Address: ", myConf.address)
echo("Port: ", myConf.port)
var myConf = newMyAppConfig()
myConf.load("myappconfig.cfg")
echo("Address: ", myConf.address)
echo("Port: ", myConf.port)