new kind of AST printer that prints indented trees

AST-to-string conversion procs renamed to repr, treeRepr and lispRepr for better consistency
new dumpTree and dumpLisp procs for quick AST inspection of arbitrary nimrod blocks

compiler/ast.nim

@@ -341,7 +341,7 @@ type
   TMagic* = enum # symbols that require compiler magic:
     mNone, mDefined, mDefinedInScope, mLow, mHigh, mSizeOf, mIs, mOf,
     mEcho, mShallowCopy, mSlurp,
-    mAstToYaml, mParseExprToAst, mParseStmtToAst, mExpandToAst,
+    mParseExprToAst, mParseStmtToAst, mExpandToAst,
     mUnaryLt, mSucc, 
     mPred, mInc, mDec, mOrd, mNew, mNewFinalize, mNewSeq, mLengthOpenArray, 
     mLengthStr, mLengthArray, mLengthSeq, mIncl, mExcl, mCard, mChr, mGCref, 

compiler/evals.nim

@@ -1118,9 +1118,6 @@ proc evalMagicOrCall(c: PEvalContext, n: PNode): PNode =
     result = evalAux(c, n.sons[1], {})
     if isSpecial(result): return
     result = newStrNodeT(result.info.toFileLineCol, n)
-  of mAstToYaml:
-    var ast = evalAux(c, n.sons[1], {efLValue})
-    result = newStrNode(nkStrLit, ast.treeToYaml.ropeToStr)
   of mNHint: 
     result = evalAux(c, n.sons[1], {})
     if isSpecial(result): return 

lib/core/macros.nim

@@ -189,40 +189,8 @@ proc toStrLit*(n: PNimrodNode): PNimrodNode {.compileTime.} =
   return newStrLitNode(repr(n))
 
 proc lineinfo*(n: PNimrodNode): string {.magic: "NLineInfo".}
-
-proc toLisp*(n: PNimrodNode): string {.compileTime.} =
-  ## Convert the AST `n` to a human-readable string
-  ##
-  ## You can use this as a tool to explore the Nimrod's abstract syntax 
-  ## tree and to discover what kind of nodes must be created to represent
-  ## a certain expression/statement
-
-  if n == nil: return "nil"
-
-  result = $n.kind
-  add(result, "(")
-  
-  case n.kind
-  of nnkEmpty: nil # same as nil node in this representation
-  of nnkNilLit: add(result, "nil")
-  of nnkCharLit..nnkInt64Lit: add(result, $n.intVal)
-  of nnkFloatLit..nnkFloat64Lit: add(result, $n.floatVal)
-  of nnkStrLit..nnkTripleStrLit: add(result, $n.strVal)
-  of nnkIdent: add(result, $n.ident)
-  of nnkSym, nnkNone: assert false
-  else:
-    add(result, toLisp(n[0]))
-    for j in 1..n.len-1:
-      add(result, ", ")
-      add(result, toLisp(n[j]))
-
-  add(result, ")")
-
-proc toYaml*(n: PNimrodNode): string {.magic: "AstToYaml".}
-  ## Converts the AST `n` to an YAML string
-  ##
-  ## Provides more detailed, potentially harder to digest information
-  ## than `toLisp`
+  ## returns the position the node appears in the original source file
+  ## in the form filename(line, col)
 
 proc parseExpr*(s: string): expr {.magic: "ParseExprToAst".}
   ## Compiles the passed string to its AST representation.
@@ -275,8 +243,8 @@ proc newCall*(theProc: string,
   result.add(newIdentNode(theProc))
   result.add(args)
 
-proc nestList*(theProc: TNimrodIdent,  
-               x: PNimrodNode): PNimrodNode {.compileTime.} = 
+proc nestList*(theProc: TNimrodIdent,
+               x: PNimrodNode): PNimrodNode {.compileTime.} =
   ## nests the list `x` into a tree of call expressions:
   ## ``[a, b, c]`` is transformed into ``theProc(a, theProc(c, d))``
   var L = x.len
@@ -285,3 +253,72 @@ proc nestList*(theProc: TNimrodIdent,
   for i in countdown(L-3, 0):
     a = newCall(theProc, x[i], copyNimTree(a))
 
+proc treeRepr*(n: PNimrodNode): string {.compileTime.} =
+  ## Convert the AST `n` to a human-readable tree-like string
+  ##
+  ## see also `repr` and `lispRepr`
+
+  proc traverse(res: var string, level: int, n: PNimrodNode) =
+    for i in 0..level-1: res.add "  "
+    
+    if n == nil:
+      res.add "nil"
+    else:
+      res.add(($n.kind).substr(3))
+      
+      case n.kind
+      of nnkEmpty: nil # same as nil node in this representation
+      of nnkNilLit: res.add(" nil")
+      of nnkCharLit..nnkInt64Lit: res.add(" " & $n.intVal)
+      of nnkFloatLit..nnkFloat64Lit: res.add(" " & $n.floatVal)
+      of nnkStrLit..nnkTripleStrLit: res.add(" " & $n.strVal)
+      of nnkIdent: res.add(" " & $n.ident)
+      of nnkSym, nnkNone: assert false
+      else:
+        for j in 0..n.len-1:
+          res.add "\n"
+          traverse(res, level + 1, n[j])
+
+  result = ""
+  traverse(result, 0, n)
+
+proc lispRepr*(n: PNimrodNode): string {.compileTime.} =
+  ## Convert the AST `n` to a human-readable lisp-like string
+  ##
+  ## see also `repr` and `treeRepr`
+  
+  if n == nil: return "nil"
+
+  result = ($n.kind).substr(3)
+  add(result, "(")
+  
+  case n.kind
+  of nnkEmpty: nil # same as nil node in this representation
+  of nnkNilLit: add(result, "nil")
+  of nnkCharLit..nnkInt64Lit: add(result, $n.intVal)
+  of nnkFloatLit..nnkFloat64Lit: add(result, $n.floatVal)
+  of nnkStrLit..nnkTripleStrLit: add(result, $n.strVal)
+  of nnkIdent: add(result, $n.ident)
+  of nnkSym, nnkNone: assert false
+  else:
+    add(result, lispRepr(n[0]))
+    for j in 1..n.len-1:
+      add(result, ", ")
+      add(result, lispRepr(n[j]))
+
+  add(result, ")")
+
+macro dumpTree*(s: stmt): stmt = echo s[1].treeRepr
+  ## Accepts a block of nimrod code and prints the parsed abstract syntax
+  ## tree using the `toTree` function.
+  ##
+  ## You can use this as a tool to explore the Nimrod's abstract syntax 
+  ## tree and to discover what kind of nodes must be created to represent
+  ## a certain expression/statement
+
+macro dumpLisp*(s: stmt): stmt = echo s[1].lispRepr
+  ## Accepts a block of nimrod code and prints the parsed abstract syntax
+  ## tree using the `toLisp` function.
+  ##
+  ## see `dumpTree`
+

web/news.txt

@@ -101,8 +101,8 @@ Library Additions
 - Added ``xmltree.innerText``.
 - Added ``os.isAbsolute``.
 - Added ``parseutils.interpolatedFragments``.
-- Added ``macros.toLisp``, ``macros.toYaml``, ``macros.parseExpr``,
-  ``macros.parseStmt``, ``macros.getAst``.
+- Added ``macros.treeRepr``, ``macros.lispRepr``, ``macros.dumpTree``, 
+  ``macros.dumpLisp``, ``macros.parseExpr``, ``macros.parseStmt``, ``macros.getAst``.
 - Added ``locks`` core module for more flexible locking support.
 - Added ``irc`` module.