Fixes for newer nim

Author: yglukhov

nimsl.nimble

@@ -1,12 +1,9 @@
 # Package
-version = "0.3.2"
+version = "0.3.3"
 author = "Yuriy Glukhov"
 description = "Shaders in Nim"
 license = "MIT"
 
-# Dependencies
-requires "variant"
-
 # Tests
 const allTests = ["test", "nimsl/private/var_decls"]
 

nimsl/emulation.nim

@@ -21,7 +21,7 @@ proc getValueByNameInTableConstr(tableConstr: NimNode, name: string): NimNode =
         if $c[0] == name:
             return c[1]
 
-macro cpuTest*(vertexShader, fragmentShader: typed, attributesAndUniforms: untyped, screenBuffer: var openarray[uint8], screenWidth: int): untyped =
+macro cpuTest*(vertexShader, fragmentShader: typed{nkSym}, attributesAndUniforms: untyped, screenBuffer: var openarray[uint8], screenWidth: int): untyped =
     var vsCalls = [newCall(vertexShader), newCall(vertexShader), newCall(vertexShader)]
     var fsCall = newCall(fragmentShader)
     var varyingDefs = newStmtList()
@@ -34,7 +34,7 @@ macro cpuTest*(vertexShader, fragmentShader: typed, attributesAndUniforms: untyp
 
     var globalVarSyms = newSeq[NimNode]()
 
-    for param in getImpl(vertexShader.symbol).paramsAndTypes:
+    for param in getImpl(vertexShader).paramsAndTypes:
         let paramName = $(param.name)
         if paramName.startsWith("v"):
             let varSym = genSym(nskLet, paramName)
@@ -61,7 +61,7 @@ macro cpuTest*(vertexShader, fragmentShader: typed, attributesAndUniforms: untyp
             for i in 0 .. 2:
                 vsCalls[i].add(getValueByNameInTableConstr(attributesAndUniforms, paramName))
 
-    for param in getImpl(fragmentShader.symbol).paramsAndTypes:
+    for param in getImpl(fragmentShader).paramsAndTypes:
         let paramName = $(param.name)
         if paramName.startsWith("v"):
             for vs in globalVarSyms:

nimsl/nimsl.nim

@@ -1,19 +1,19 @@
-import macros, math, strutils
+import macros, math
 import private/glsl_codegen
 
 proc getShaderCode(s: NimNode, k: ShaderKind, mainProcName: string): string =
     var ctx = newCtx()
     ctx.mainProcName = mainProcName
     ctx.shaderKind = k
-    genProcDef(ctx, getImpl(s.symbol), true)
+    genProcDef(ctx, getImpl(s), true)
     result = ""
     for i in ctx.globalDefs:
         result &= i
 
-macro getGLSLFragmentShader*(s: typed, mainProcName: string = "main"): string =
+macro getGLSLFragmentShader*(s: typed{nkSym}, mainProcName: string = "main"): string =
     result = newLit(getShaderCode(s, skFragmentShader, mainProcName.strVal))
 
-macro getGLSLVertexShader*(s: typed): string =
+macro getGLSLVertexShader*(s: typed{nkSym}): string =
     result = newLit(getShaderCode(s, skVertexShader, "main"))
 
 type

nimsl/private/glsl_codegen.nim

@@ -48,7 +48,7 @@ proc hasMagicMarker(n: NimNode, marker: string): bool =
             let fs = b[0]
             result = fs.isMagicCallNode()
     of nnkSym:
-        result = hasMagicMarker(getImpl(n.symbol), marker)
+        result = hasMagicMarker(getImpl(n), marker)
     of nnkStmtListExpr:
         let fs = n[0]
         result = fs.isMagicCallNode()
@@ -119,8 +119,8 @@ proc genStmtList(ctx: var GLSLCompilerContext, n: NimNode, r: var string) =
         genSemicolon(r)
 
 proc isSystemSym(s: NimNode): bool =
-    let ln = s.symbol.getImpl().lineinfo
-    if ln.find("/system.nim(") != -1 or ln.find("\\system.nim(") != -1:
+    let ln = s.getImpl().lineinfo
+    if ln.find("/system.nim(") != -1 or ln.find("\\system.nim(") != -1 or ln.find("\\system\\") != -1 or ln.find("/system/") != -1:
         result = true
 
 proc genSystemCall(ctx: var GLSLCompilerContext, n: NimNode, r: var string) =
@@ -233,15 +233,15 @@ proc genGLSLBuiltinSym(n: NimNode): string =
     else: result = pn
 
 proc genSym(ctx: var GLSLCompilerContext, n: NimNode, r: var string) =
-    let i = getImpl(n.symbol)
+    let i = getImpl(n)
     case i.kind
     of nnkProcDef:
         if isGLSLBuiltin(i):
             r &= genGLSLBuiltinSym(n)
         else:
             #echo "SYMBOL: ", treeRepr(i)
-            if not ($(n.symbol) in ctx.definedSyms):
-                ctx.definedSyms.add($(n.symbol))
+            if $n notin ctx.definedSyms:
+                ctx.definedSyms.add($n)
                 gen(ctx, i, r)
             r &= $n
     else:

nimsl/private/var_decls.nim

@@ -1,42 +1,29 @@
-import macros, tables, variant
+import macros, tables
 
-var varTab: TableRef[TypeID, RootRef]
+type
+  VarValue[T] = ref object of RootRef
+    v: T
 
-proc varNotFound(name: string) =
-    discard
-    #raise newException(Exception, "Var " & name & " not set")
+var varTab: TableRef[string, RootRef]
 
 proc getVarAddr[T](name: string): ptr T =
     if varTab.isNil:
-        varNotFound(name)
-        varTab = newTable[TypeID, RootRef]()
-    const tid = getTypeId(T)
-    var t = varTab.getOrDefault(tid)
-    var tt : TableRef[string, T]
-    if t.isNil:
-        varNotFound(name)
-        tt = newTable[string, T]()
-        varTab[tid] = cast[RootRef](tt)
-    else:
-        tt = cast[TableRef[string, T]](t)
-    if name notin tt:
-        varNotFound(name)
-        var v: T
-        tt[name] = v
-    result = addr tt[name]
+        varTab = newTable[string, RootRef]()
+    var vv = VarValue[T](varTab.getOrDefault(name))
+    if vv.isNil:
+        vv = VarValue[T]()
+        varTab[name] = vv
+    addr vv.v
 
 proc setVar[T](name: string, v: T) =
     if varTab.isNil:
-        varTab = newTable[TypeID, RootRef]()
-    const tid = getTypeId(T)
-    var t = varTab.getOrDefault(tid)
-    var tt : TableRef[string, T]
-    if t.isNil:
-        tt = newTable[string, T]()
-        varTab[tid] = cast[RootRef](tt)
+        varTab = newTable[string, RootRef]()
+    var vv = VarValue[T](varTab.getOrDefault(name))
+    if vv.isNil:
+        vv = VarValue[T](v: v)
+        varTab[name] = vv
     else:
-        tt = cast[TableRef[string, T]](t)
-    tt[name] = v
+        vv.v = v
 
 proc nimslUniformAddr[T](name: string): ptr T {.inline.} = getVarAddr[T](name)
 proc nimslVaryingAddr[T](name: string): ptr T {.inline.} = getVarAddr[T](name)