adds incExpect and skipParRi proc

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -17,6 +17,26 @@ proc nodeKind(n: Cursor): TNodeKind {.inline.} =
   assert n.kind == ParLe
   pool.tags[n.tagId].parseNodeKind()
 
+proc expect(n: Cursor; k: set[NifKind]) =
+  if n.kind notin k:
+    when defined(debug):
+      writeStackTrace()
+    quit "[NIF decoder] expected: " & $k & " but got: " & $n.kind & toString n
+
+proc expect(n: Cursor; k: NifKind) {.inline.} =
+  expect n, {k}
+
+proc incExpect(n: var Cursor; k: set[NifKind]) =
+  inc n
+  expect n, k
+
+proc incExpect(n: var Cursor; k: NifKind) {.inline.} =
+  incExpect n, {k}
+
+proc skipParRi(n: var Cursor) =
+  expect n, {ParRi}
+  inc n
+
 type
   SplittedNifSym = object
     name: string
@@ -56,14 +76,12 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
     of nkImportStmt: skModule
     of nkEnumTy: skEnumField
     else: skConst
-  inc n
-  assert n.kind == SymbolDef
+  incExpect n, SymbolDef
   let nifSymId = n.symId
   let symdef = pool.syms[nifSymId].splitNifSym
   assert symdef.name.len != 0
   let ident = c.graph.cache.getIdent(symdef.name)
-  inc n
-  assert n.kind == IntLit
+  incExpect n, IntLit
   let itemId = pool.integers[n.intId].int32
   inc n
   assert n.kind in {Symbol, DotToken}, $n.kind
@@ -95,8 +113,7 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
   let hasSym = c.nifSymToPSym.hasKeyOrPut(nifSymId, psym)
   assert not hasSym
 
-  assert n.kind == ParRi
-  inc n
+  skipParRi n
 
 include nifdecodertypes
 
@@ -107,7 +124,7 @@ proc fromNifNodeFlags(n: var Cursor): set[TNodeFlag] =
     assert n.kind == Ident
     result = parseNodeFlags(pool.strings[n.litId])
     inc n
-    expect n, ParRi
+    skipParRi n
 
 proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   result = newNodeI(kind, unknownLineInfo, 1)
@@ -123,10 +140,8 @@ proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   else:
     result[0][0].sym.typ = fromNifType(c, n)
   result[0][2] = fromNif(c, n)
-  assert n.kind == ParRi  # nkIdentDefs
-  inc n
-  assert n.kind == ParRi
-  inc n
+  skipParRi n  # nkIdentDefs
+  skipParRi n
 
 proc fromNifTypeSection(c: var DecodeContext; n: var Cursor): PNode =
   result = newNodeI(nkTypeDef, unknownLineInfo, 3)
@@ -153,8 +168,7 @@ proc fromNifTypeSection(c: var DecodeContext; n: var Cursor): PNode =
   result[2] = newNode(nkEmpty)
   sym.sym.typ = fromNifType(c, n)
 
-  assert n.kind == ParRi
-  inc n
+  skipParRi n
 
 proc fromNifImport(c: var DecodeContext; n: var Cursor): PNode =
   result = newNode(nkImportStmt)
@@ -236,8 +250,7 @@ proc fromNifSuf(c: var DecodeContext; n: var Cursor): PNode =
   else:
     assert false, "invalid node in suf node " & $n.kind
   inc n
-  assert n.kind == ParRi
-  inc n
+  skipParRi n
 
 proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
   result = nil

compiler/icnif/nifdecodertypes.nim

@@ -1,13 +1,5 @@
 # included from nifdecoder.nim
 
-proc expect(n: var Cursor; k: NifKind) =
-  if n.kind == k:
-    inc n
-  else:
-    when defined(debug):
-      writeStackTrace()
-    quit "[NIF decoder] expected: " & $k & " but got: " & $n.kind & toString n
-
 const SysTypeKinds = {tyBool, tyChar, tyString, tyInt .. tyUInt64}
 
 proc getSysTypeSym(c: var DecodeContext; typeKind: TTypeKind): PSym =
@@ -31,8 +23,7 @@ proc readTypeKind(n: var Cursor; tag: string): TTypeKind =
   if tag.len == 1:
     case tag[0]
     of 'i':
-      inc n
-      assert n.kind == IntLit
+      incExpect n, IntLit
       case pool.integers[n.intId]
       of -1: result = tyInt
       of 8: result = tyInt8
@@ -42,8 +33,7 @@ proc readTypeKind(n: var Cursor; tag: string): TTypeKind =
       else: assert false
       inc n
     of 'u':
-      inc n
-      assert n.kind == IntLit
+      incExpect n, IntLit
       case pool.integers[n.intId]
       of -1: result = tyUInt
       of 8: result = tyUInt8
@@ -53,17 +43,15 @@ proc readTypeKind(n: var Cursor; tag: string): TTypeKind =
       else: assert false
       inc n
     of 'f':
-      inc n
-      assert n.kind == IntLit
+      incExpect n, IntLit
       case pool.integers[n.intId]
       of -1: result = tyFloat
       of 32: result = tyFloat32
       of 64: result = tyFloat64
       else: assert false
       inc n
     of 'c':
-      inc n
-      assert n.kind == IntLit
+      incExpect n, IntLit
       case pool.integers[n.intId]
       of 8: result = tyChar
       else: assert false
@@ -83,7 +71,7 @@ proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res:
       var sym = fromNifSymDef(c, n, nkEnumTy)
       sym.sym.typ = res
       res.n.add sym
-    expect n, ParRi
+    inc n
   of tyFromExpr:
     res.n = fromNif(c, n)
   of tyStatic:
@@ -96,7 +84,7 @@ proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res:
   else:
     while n.kind != ParRi:
       res.addAllowNil fromNifType(c, n)
-    expect n, ParRi
+    inc n
 
 proc fromNifType(c: var DecodeContext; n: var Cursor): PType =
   case n.kind
@@ -128,13 +116,11 @@ proc fromNifType(c: var DecodeContext; n: var Cursor): PType =
         #echo "Create non SysTypeKinds type: ", k, ": ", tag
         result = newType(k, c.idgen, c.owner)
       if n.kind == ParLe and pool.tags[n.tag] == "tf":
+        incExpect n, Ident
+        result.flags = parseTypeFlags pool.strings[n.litId]
         inc n
-        if n.kind == Ident:
-          result.flags = parseTypeFlags pool.strings[n.litId]
-          inc n
-        else:
-          expect n, Ident
-        expect n, ParRi
+        skipParRi n
       fromNifTypeImpl c, n, k, result
   else:
     expect n, ParLe
+    inc n