Add #setting

Author: armano2

.vscode/launch.json

@@ -14,22 +14,22 @@
       "type": "node",
       "request": "launch",
       "name": "Mocha Tests",
-      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "-u",
         "tdd",
         "--timeout",
         "999999",
         "--colors",
-        "${workspaceRoot}/test/*.ts"
+        "${workspaceFolder}/test/*.ts"
       ],
       "internalConsoleOptions": "openOnSessionStart"
     },
     {
       "type": "node",
       "request": "launch",
       "name": "Update Ast",
-      "program": "${workspaceRoot}/scripts/update-ast",
+      "program": "${workspaceFolder}/scripts/update-ast",
       "internalConsoleOptions": "openOnSessionStart"
     }
   ]

README.md

@@ -45,7 +45,7 @@ console.log(data.tokens)
   - interpolations `${foo}`
     - methods, i.e. `${avg(3, 5)}`
   - executing macro
-  - directives:  http://freemarker.sourceforge.net/docs/ref_directives.html
+  - directives: http://freemarker.sourceforge.net/docs/ref_directives.html
     - `#attempt`
       - `#recover`
     - `#assign`
@@ -68,6 +68,7 @@ console.log(data.tokens)
       - `#return`
     - `#noparse`, `#noParse`
     - `#stop`
+    - `#setting`
   - comments `<#-- -->`
 
 ## TODO:
@@ -91,6 +92,5 @@ console.log(data.tokens)
     - `#nt`
     - `#recurse`
     - `#rt`
-    - `#setting`
     - `#t`
     - `#visit`

src/enum/NodeNames.ts

@@ -24,6 +24,7 @@ enum NodeNames {
   Compress = 'Compress',
   Import = 'Import',
   Stop = 'Stop',
+  Setting = 'Setting',
 
   // Not supported
   // Escape = 'Escape',
@@ -35,7 +36,6 @@ enum NodeNames {
   // Nested = 'Nested',
   // Nt = 'Nt',
   // Rt = 'Rt',
-  // Setting = 'Setting',
   // T = 'T',
 }
 

src/types/Nodes/AbstractNode.ts

@@ -17,7 +17,7 @@ export default abstract class AbstractNode implements ILoc {
     this.end = token.end
   }
 
-  public addToNode (child : AbstractNode) {
+  public addToNode (child : AbstractNode) : void {
     throw new NodeError(`Node ${this.type} can't contain ${child.type}`, child)
   }
 }

src/types/Nodes/ISetting.ts

@@ -0,0 +1,24 @@
+import NodeNames from '../../enum/NodeNames'
+import ParamNames from '../../enum/ParamNames'
+import NodeError from '../../errors/NodeError'
+import { parseAssignParams } from '../../utils/Params'
+import { IAssignmentExpression } from '../Params'
+import { IToken } from '../Tokens'
+import AbstractNode from './AbstractNode'
+
+export default class ISetting extends AbstractNode {
+  public expression : IAssignmentExpression
+
+  constructor (token : IToken) {
+    super(NodeNames.Setting, token)
+    const params = parseAssignParams(token.start, token.end, token.params)
+    if (params && params.length === 1) {
+      const expression = params[0]
+      if (expression.type === ParamNames.AssignmentExpression) {
+        this.expression = expression
+        return
+      }
+    }
+    throw new NodeError(`Invalid parameters in ${NodeNames.Setting}`, token)
+  }
+}

src/types/Tokens.ts

@@ -1,5 +1,10 @@
 import { ENodeType } from '../Symbols'
 
+export interface ILoc {
+  start : number
+  end : number
+}
+
 export interface IToken extends ILoc {
   type : ENodeType
   startTag? : string
@@ -8,8 +13,3 @@ export interface IToken extends ILoc {
   text : string
   isClose : boolean
 }
-
-export interface ILoc {
-  start : number
-  end : number
-}

src/utils/Directives.ts

@@ -29,7 +29,7 @@ const Directives : IDirectivesTypes = {
   // recurse: NodeNames.Recurse,
   return: NodeNames.Return,
   // rt: NodeNames.Rt,
-  // setting: NodeNames.Setting,
+  setting: NodeNames.Setting,
   stop: NodeNames.Stop,
   switch: NodeNames.Switch,
   case: NodeNames.SwitchCase,

src/utils/Nodes.ts

@@ -17,6 +17,7 @@ import ILocal from '../types/Nodes/ILocal'
 import IMacro from '../types/Nodes/IMacro'
 import IMacroCall from '../types/Nodes/IMacroCall'
 import IReturn from '../types/Nodes/IReturn'
+import ISetting from '../types/Nodes/ISetting'
 import IStop from '../types/Nodes/IStop'
 import ISwitch from '../types/Nodes/ISwitch'
 import ISwitchCase from '../types/Nodes/ISwitchCase'
@@ -126,6 +127,9 @@ const Nodes : INodes = {
   [NodeNames.Stop] (token : IToken) : IStop {
     return new IStop(token)
   },
+  [NodeNames.Setting] (token : IToken) : ISetting {
+    return new ISetting(token)
+  },
 }
 
 export default Nodes

src/utils/Params.ts

@@ -1,13 +1,13 @@
 import ParamNames from '../enum/ParamNames'
 import NodeError from '../errors/NodeError'
 import { ParamsParser } from '../ParamsParser'
-import { AllParamTypes, IAssignmentExpression, IExpression, IIdentifier, IUpdateExpression } from '../types/Params'
+import { AllParamTypes, IAssignmentExpression, IIdentifier, IUpdateExpression } from '../types/Params'
 
 function cIdentifier (name : string) : IIdentifier {
   return { type: ParamNames.Identifier, name }
 }
 
-export function parseAssignParams (start : number, end : number, params? : string) : IExpression[] | undefined {
+export function parseAssignParams (start : number, end : number, params? : string) : AllParamTypes[] | undefined {
   if (!params) {
     throw new NodeError('Assign require params', { start, end })
   }