ako-lang · kefniark · May 14, 2021 · May 14, 2021
diff --git a/ako_grammar.txt b/ako_grammar.txt
@@ -3,7 +3,7 @@ Ako {
 
   // Statement
   Block = "{" Stmt* "}"
-  Stmt = (Metadata | If | Assign | AssignTask | TaskDef | SkipTask | Task | ForLoop | Expr)
+  Stmt = (Metadata | If | Assign | AssignTask | TaskDef | SkipTask | Task | ForLoop | Expr | comment)
 
   Assign = AssignLeft | AssignAdd | AssignIncr | AssignDecr | AssignSub
   AssignTask = Var "=" (SkipTask | Task)
@@ -23,9 +23,9 @@ Ako {
   // Expression
   Pipe = (Pipe | ExprItem) "|>" ExprItem
   Expr =  Pipe | ExprItem
-  ExprItem = LambdaInline | Fn | MathExpr | Term
+  ExprItem = LambdaInline | MathExpr
 
-  Term = Var | Number | String | bool | Array | Dictionary | Last
+  Term = Fn | bool | Var | Number | String | Array | Dictionary | Last
   Fn = (id ".")? id "(" Arguments ")"
   // Lambda = "(" ListOf<id, ","> ")" "=>" Block
   LambdaInline = "(" ListOf<id, ","> ")" "=>" Expr
@@ -81,7 +81,7 @@ Ako {
               |  Var "." id  -- select
               |  id -- single
 
-  id  = ~keyword char
+  id  = ~(keyword end) char
   char = letter (letter | digit | "_")*
   keyword = "$" | "task" | "for" | "false" | "true" | "or" | "and" | "not" | "if" | "elif" | "else" | "continue" | "return"
 
@@ -110,7 +110,8 @@ Ako {
   hex    = "#" hexDigit+
 
   // Other
-  space := "\t" | " " | "\n" | "\r" | comment | multilinecomment
-  comment = "//" (~"\n" any)*
+  space := "\t" | " " | "\n" | "\r"
+  comment = singlecomment | multilinecomment
+  singlecomment = "//" (~"\n" any)*
   multilinecomment = "/*" (~"*/"any)* "*/"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
     "cli",
     "nocode",
     "lowcode",
-    "interpreter"
+    "interpreter",
+    "Ako"
   ],
   "author": {
     "name": "Kevin destrem",
@@ -74,6 +75,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "chalk": "^4.1.1"
+    "chalk": "^4.1.1",
+    "dateformat": "^4.5.1"
   }
 }
diff --git a/samples/fibo.ako b/samples/fibo.ako
@@ -1,8 +1,6 @@
 ## Name "Fibonachi"
 ## Desc "Compute the fibonachi sequence for a given value"
-## Args [
-  { name = "val", type = "int", default = 1, description = "" }
-]
+## Args [{ name = "val", type = "int", default = 1, description = "" }]
 ## Return "int"
 
 if val <= 0 { return 0 }

diff --git a/samples/main.ako b/samples/main.ako
@@ -1,5 +1,7 @@
+start = Time.now()
 fibo15 = @fibo(15)
-@print("Fibo(15) = {fibo15}")
+duration = Time.now() - start
+@print("Fibo(15) = {fibo15} (in {duration}ms)")
 
 @Math.main()
 

diff --git a/src/dist/ako-node.ts b/src/dist/ako-node.ts
@@ -13,7 +13,9 @@ const {grammar, ASTBuilder} = getGrammar(akoGrammar)
 
 const toAst = (codeTxt: string) => {
   const match = grammar.match(codeTxt.toString())
-  if (!match) throw new Error(`Syntax Error`)
+  if (!match || match.failed()) {
+    throw new Error(`Syntax Error ${match.message}`)
+  }
   return ASTBuilder(match).toAST()
 }
 export {toAst, Interpreter, Analyzer}
diff --git a/src/elements/scalar.ts b/src/elements/scalar.ts
@@ -35,6 +35,15 @@ export const String: ScalarCommandEntry<string> = {
   }
 }
 
+export const Comment = {
+  create: (value) => {
+    return {type: 'Comment', value}
+  },
+  execute: (ctx, entry, entryData, time) => {
+    return {timeRemains: time, done: true}
+  }
+}
+
 export const Number: ScalarCommandEntry<number> = {
   create: (value) => {
     return {type: 'Number', value}

diff --git a/src/semantic.ts b/src/semantic.ts
@@ -21,8 +21,8 @@ export function getGrammar(akoGrammar: string) {
     const src = start.source.sourceString
     const line = src.substring(0, start.source.startIdx).split('\n').length - 1
     const sample = src.substring(start.source.startIdx, end.source.endIdx)
-    const before = src.substring(start.source.startIdx - 15 > 0 ? start.source.startIdx - 15 : 0, start.source.startIdx)
-    const after = src.substring(end.source.endIdx, end.source.endIdx + 15)
+    const before = src.substring(start.source.startIdx - 10 > 0 ? start.source.startIdx - 10 : 0, start.source.startIdx)
+    const after = src.substring(end.source.endIdx, end.source.endIdx + 10)
 
     res.debug = {
       line,
@@ -105,8 +105,9 @@ export function getGrammar(akoGrammar: string) {
     Return: (a, b) => debugWrapper(a, b, AkoElement.Return.create(b.toAST())),
 
     // Var
+    comment: (a) => debugWrapper(a, a, AkoElement.Comment.create(a.sourceString)),
     id: (a) => debugWrapper(a, a, AkoElement.String.create(a.sourceString)),
-    Var_single: (a) => debugWrapper(a, a, AkoElement.Symbol.create(a.toAST())),
+    Var_single: (a) => debugWrapper(a, a, AkoElement.Symbol.create(a.sourceString)),
     Var_select: (a, b, c) => debugWrapper(a, c, AkoElement.SymbolSelect.create(a.toAST(), c.toAST())),
     Var_range: (a, b, c, d, e, f) => debugWrapper(a, f, AkoElement.SymbolRange.create(a.toAST(), c.toAST(), e.toAST())),
     Var_subscript: (a, b, c, d) => debugWrapper(a, d, AkoElement.SymbolSub.create(a.toAST(), c.toAST())),

diff --git a/src/std/index.ts b/src/std/index.ts
@@ -1,11 +1,13 @@
 // functions
 import {angle, vector2} from './geometry'
 import {math} from './math'
+import {time} from './time'
 import {list} from './collections'
 import {string, is} from './scalar'
 
 export const stdFunctions = {
   ...math,
+  ...time,
   ...angle,
   ...vector2,
   ...list,

diff --git a/src/std/math.ts b/src/std/math.ts
@@ -0,0 +1,18 @@
+export function precisionRound(num: number, precision = 14) {
+  const factor = Math.pow(10, precision)
+  return Math.round(num * factor) / factor
+}
+
+export const math = {
+  'Math.PI': (): number => Math.PI,
+  'Math.max': (...args: number[]): number => Math.max(...args),
+  'Math.min': (...args: number[]): number => Math.min(...args),
+  'Math.abs': (arg: number): number => Math.abs(arg),
+  'Math.ceil': (arg: number): number => Math.ceil(arg),
+  'Math.floor': (arg: number): number => Math.floor(arg),
+  'Math.round': (arg: number): number => Math.round(arg),
+
+  // random
+  'Math.rand': (min = 0, max = 1): number => Math.random() * (max - min) + min,
+  'Math.randint': (min = 0, max = 1): number => Math.floor(Math.random() * (max + 1 - min) + min)
+}
diff --git a/src/std/math/index.ts b/src/std/math/index.ts
diff --git a/src/std/time.ts b/src/std/time.ts
@@ -0,0 +1,24 @@
+import dateFormat from 'dateformat'
+
+export const time = {
+  'Time.now': (): number => Date.now(),
+
+  SECOND: (val = 1) => val * 1000,
+  MINUTE: (val = 1) => val * 60 * 1000,
+  HOUR: (val = 1) => val * 60 * 60 * 1000,
+  DAY: (val = 1) => val * 24 * 60 * 60 * 1000,
+  WEEK: (val = 1) => val * 7 * 24 * 60 * 60 * 1000,
+  YEAR: (val = 1) => 365 * 24 * 60 * 60 * 1000,
+
+  'Time.day': (d?: number): number => new Date(d ? d : undefined).getDate(),
+  'Time.weekday': (d?: number): number => new Date(d ? d : undefined).getDay(),
+  'Time.year': (d?: number): number => new Date(d ? d : undefined).getFullYear(),
+  'Time.hour': (d?: number): number => new Date(d ? d : undefined).getHours(),
+  'Time.minute': (d?: number): number => new Date(d ? d : undefined).getMinutes(),
+  'Time.second': (d?: number): number => new Date(d ? d : undefined).getSeconds(),
+  'Time.ms': (d?: number): number => new Date(d ? d : undefined).getMilliseconds(),
+
+  'Time.parse': (str: string) => Date.parse(str),
+  'Time.format': (d: number, format = 'yyyy-mm-dd HH:MM:ss') => dateFormat(new Date(d), format),
+  'Time.tz': () => new Date().getTimezoneOffset()
+}
diff --git a/tests/elements/function.test.ts b/tests/elements/function.test.ts
@@ -13,9 +13,14 @@ a = unknown(1,2,3,4,5)
   it('Check Expression Function', () => {
     const {stack} = runCode(`
 a = Math.max(1,2,3,4,5)
-
+b = Math.max(1,2,3,4,5) - 2
+c = 2 - Math.max(1,2,3,4,5)
+d = (Math.max(1,2,3,4,5) + 2) % 5
     `)
     assert.strictEqual((stack.data as any)['a'], 5)
+    assert.strictEqual((stack.data as any)['b'], 3)
+    assert.strictEqual((stack.data as any)['c'], -3)
+    assert.strictEqual((stack.data as any)['d'], 2)
   })
 
   it('Vector', () => {

diff --git a/tests/std/time.test.ts b/tests/std/time.test.ts
@@ -0,0 +1,66 @@
+import assert from 'assert'
+import {runCode} from '../helper'
+
+describe('Time', () => {
+  it('now', () => {
+    const {stack: stack} = runCode(`
+a = Time.now()
+    `)
+    assert.strictEqual(Date.now() - (stack.data as any)['a'] < 5, true)
+  })
+
+  it('parse', () => {
+    const {stack: stack} = runCode(`
+b = Time.parse('2014-07-03')
+c = Time.parse('2014-07-03') |> $ + HOUR(5) |> Time.format($, 'yyyy-mm-dd')
+    `)
+    assert.strictEqual((stack.data as any)['b'], Date.parse('2014-07-03'))
+    assert.strictEqual((stack.data as any)['c'], '2014-07-03')
+  })
+
+  it('getter', () => {
+    const {stack: stack} = runCode(`
+date = Time.parse('2014-07-03 17:10:22')
+
+a = Time.day(date) // get day 0-31
+b = Time.weekday(date) // get day in the week 0-6
+c = Time.year(date) // get year 2014
+d = Time.hour(date) // get hour 0-23
+e = Time.minute(date) // get minute 0-59
+f = Time.second(date) // get second 0-59
+g = Time.ms(date) // get second 0-999
+h = Time.tz() // get timezone offset in minute
+i = Time.format(date, 'yyyy-mm-dd HH:MM:ss')
+    `)
+
+    assert.strictEqual((stack.data as any)['a'], 3)
+    assert.strictEqual((stack.data as any)['b'], 4)
+    assert.strictEqual((stack.data as any)['c'], 2014)
+    assert.strictEqual((stack.data as any)['d'], 17)
+    assert.strictEqual((stack.data as any)['e'], 10)
+    assert.strictEqual((stack.data as any)['f'], 22)
+    assert.strictEqual((stack.data as any)['g'], 0)
+    assert.strictEqual((stack.data as any)['h'], new Date().getTimezoneOffset())
+    assert.strictEqual((stack.data as any)['i'], '2014-07-03 17:10:22')
+  })
+
+  it('getter', () => {
+    const {stack: stack} = runCode(`
+date = Time.parse('2014-07-03 12:01:02')
+
+d1 = Time.format(date + SECOND(10))
+d2 = Time.format(date + MINUTE(10))
+d3 = Time.format(date + HOUR(24))
+d4 = Time.format(date + DAY(24))
+d5 = Time.format(date + WEEK())
+d6 = Time.format(date + YEAR())
+    `)
+
+    assert.strictEqual((stack.data as any)['d1'], '2014-07-03 12:01:12')
+    assert.strictEqual((stack.data as any)['d2'], '2014-07-03 12:11:02')
+    assert.strictEqual((stack.data as any)['d3'], '2014-07-04 12:01:02')
+    assert.strictEqual((stack.data as any)['d4'], '2014-07-27 12:01:02')
+    assert.strictEqual((stack.data as any)['d5'], '2014-07-10 12:01:02')
+    assert.strictEqual((stack.data as any)['d6'], '2015-07-03 12:01:02')
+  })
+})