add inner (of lists) type, add floor, ceil, and roundd standard functions, and a ton of examples

bad.ang

@@ -1,5 +1,40 @@
-import "lib/list.ang"
+import "lib/math.ang"
 
-write(str(map([1, 2, 3], func(n: number) number {
-    return n*n
-})))
+primes := [2]
+
+func is_prime(x: number) boolean {
+    i := 0
+    while i < primes.length() && primes.at(i)*primes.at(i) < x {
+        if mod(x, primes.at(i)) == 0 {
+            return false
+        }
+        i = i + 1
+    }
+
+    return true
+}
+
+n := 1
+max := 100000
+
+while n < max {
+    n = n + 2
+
+    if is_prime(n) {
+        primes.append(n)
+
+        # Update counter
+        print(char(0x0D))
+        print(str(n))
+        print("/")
+        print(str(max))
+        print(char(0x09))
+        print(str(roundd(n/max*100, 2)))
+        print("%")
+        print(char(0x09))
+        print(str(primes.length()))
+        print(" primes")
+    }
+}
+
+write(str(primes))

chars.ang

@@ -0,0 +1,15 @@
+
+MAX_WIDTH := 16
+
+print(" ")
+w := 1
+n := 0x21
+while n < 0xA0 {
+    print(char(n))
+    n = n + 1
+    w = w + 1
+    if w >= MAX_WIDTH {
+        write("")
+        w = 0
+    }
+}

codegen.ang

@@ -0,0 +1,24 @@
+
+passphrase := "Hello world!".split("")
+start := [0, 0, 0]
+modulus := 10
+base := byte("!")
+
+i := 0
+n := 0
+while n < passphrase.length() {
+    b := byte(passphrase.at(n))
+
+    v = start.at(i) + b - base
+    while v >= modulus {
+        v = v - modulus
+    }
+
+    start.put(i, v)
+
+    if i >= 3 {
+        i = 0
+    }
+    n = n + 1
+}
+

core/compiler.go

@@ -404,10 +404,20 @@ func (c *Compiler) compile(tree Node) error {
 				return c.error(fmt.Sprintf("argument #%d does not have expected type signature: got %s, requires %s", i, sig, f.In[i]), arg)
 			}
 
-			err = c.compile(arg)
-			if err != nil {
-				return err
+			if c.isTreeConstant(arg) {
+				v, err := c.compute(arg)
+				if err != nil {
+					return err
+				}
+				c.add(InstructionConstant)
+				c.addConstant(v)
+			} else {
+				err = c.compile(arg)
+				if err != nil {
+					return err
+				}
 			}
+
 		}
 
 		err = c.compile(n.source)
@@ -716,6 +726,18 @@ func (c *Compiler) deduceSignature(tree Node) (TypeSignature, error) {
 			return nil, c.error(fmt.Sprintf("bad argument count (expected %v, got %v)", len(f.In), len(n.args)), n)
 		}
 
+		var innerType TypeSignature
+		if n.source.Type() == AccessNodeType {
+			member, err := c.deduceSignature(n.source.(*AccessNode).source)
+			if err != nil {
+				return nil, err
+			}
+
+			if member.Type() == TypeList {
+				innerType = member.(*ListSignature).Contents
+			}
+		}
+
 		// type check arguments
 		for i, arg := range n.args {
 			sig, err := c.deduceSignature(arg)
@@ -723,11 +745,28 @@ func (c *Compiler) deduceSignature(tree Node) (TypeSignature, error) {
 				return nil, err
 			}
 
-			if !sig.Matches(f.In[i]) {
+			t := f.In[i]
+			if t.Type() == TypeInner {
+				if innerType == nil {
+					return nil, c.error(fmt.Sprintf("function source (%s) has no inner type", sig), n.source)
+				}
+
+				t = innerType
+			}
+
+			if !sig.Matches(t) {
 				return nil, c.error(fmt.Sprintf("argument #%d has wrong type signature. requires %s, got %s", i, f.In[i], sig), arg)
 			}
 		}
 
+		if f.Out.Type() == TypeInner {
+			if innerType == nil {
+				return nil, c.error(fmt.Sprintf("function source (%s) has no inner type", sig), n.source)
+			}
+
+			return innerType, nil
+		}
+
 		return f.Out, nil
 
 	case FunctionNodeType:
@@ -954,7 +993,14 @@ func (c *Compiler) isTreeConstant(tree Node) bool {
 		return true
 	case BinaryNodeType:
 		return c.isTreeConstant(tree.(*BinaryNode).Left) && c.isTreeConstant(tree.(*BinaryNode).Right)
-	case BlockNodeType, ConditionalNodeType, LoopNodeType, AssignNodeType, CallNodeType, FunctionNodeType,
+	case CallNodeType:
+		for _, arg := range tree.(*CallNode).args {
+			if !c.isTreeConstant(arg) {
+				return false
+			}
+		}
+		return c.isTreeConstant(tree.(*CallNode).source)
+	case BlockNodeType, ConditionalNodeType, LoopNodeType, AssignNodeType, FunctionNodeType,
 		ReturnNodeType, AccessNodeType, BreakpointNodeType, ReferenceNodeType:
 		return false
 	default:
@@ -1009,6 +1055,31 @@ func (c *Compiler) compute(tree Node) (Value, error) {
 			-v.(*NumberValue).Number,
 		}, nil
 
+	case *CallNode:
+		source, err := c.compute(n.source)
+		if err != nil {
+			return nil, err
+		}
+
+		f, ok := source.(*BuiltinFunctionValue)
+		if !ok {
+			return nil, nil
+		}
+
+		if !f.Constant {
+			return nil, nil
+		}
+
+		args := make([]Value, len(f.Signature.In))
+		for i, arg := range n.args {
+			args[i], err = c.compute(arg)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		return f.F(nil, nil, args)
+
 	default:
 		panic(fmt.Sprintf("unexpected node %s, %T", tree.String(), tree))
 	}

core/types.go

@@ -17,6 +17,7 @@ const (
 	TypeFunction
 	TypeAny
 	TypeComposite
+	TypeInner
 )
 
 func (t Type) String() string {
@@ -39,6 +40,8 @@ func (t Type) String() string {
 		return "any"
 	case TypeComposite:
 		return "composite"
+	case TypeInner:
+		return "inner"
 	}
 
 	panic(fmt.Sprintf("unsupported string conversion for type %v", int(t)))
@@ -330,3 +333,17 @@ func (s *CompositeSignature) Matches(other TypeSignature) bool {
 func (s *CompositeSignature) String() string {
 	return fmt.Sprintf("%s|%s", s.A, s.B)
 }
+
+type InnerSignature struct{}
+
+func (*InnerSignature) Type() Type {
+	return TypeInner
+}
+
+func (*InnerSignature) Matches(_ TypeSignature) bool {
+	return false
+}
+
+func (*InnerSignature) String() string {
+	return "inner"
+}

core/values.go

@@ -434,7 +434,7 @@ var ListPrototype = map[string]*BuiltinFunctionValue{
 			[]TypeSignature{
 				&NumberSignature{},
 			},
-			&AnySignature{},
+			&InnerSignature{},
 		},
 		func(_ *VM, this Value, p []Value) (Value, error) {
 			items := this.(*ListValue).Items

core/vm.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"math"
 	"os"
 	"strings"
 )
@@ -479,6 +480,45 @@ var DefaultGlobals = map[string]Value{
 		nil,
 		false,
 	},
+	"floor": &BuiltinFunctionValue{
+		"floor",
+		&FunctionSignature{
+			[]TypeSignature{&NumberSignature{}},
+			&NumberSignature{},
+		},
+		func(vm *VM, this Value, args []Value) (Value, error) {
+			return &NumberValue{math.Floor(args[0].(*NumberValue).Number)}, nil
+		},
+		nil,
+		true,
+	},
+	"ceil": &BuiltinFunctionValue{
+		"ceil",
+		&FunctionSignature{
+			[]TypeSignature{&NumberSignature{}},
+			&NumberSignature{},
+		},
+		func(vm *VM, this Value, args []Value) (Value, error) {
+			return &NumberValue{math.Ceil(args[0].(*NumberValue).Number)}, nil
+		},
+		nil,
+		true,
+	},
+	"roundd": &BuiltinFunctionValue{
+		"roundd",
+		&FunctionSignature{
+			[]TypeSignature{&NumberSignature{}, &NumberSignature{}},
+			&NumberSignature{},
+		},
+		func(vm *VM, this Value, args []Value) (Value, error) {
+			x := args[0].(*NumberValue).Number
+			decimals := args[1].(*NumberValue).Number
+			multiplier := math.Pow(10, decimals)
+			return &NumberValue{math.Round(x*multiplier) / multiplier}, nil
+		},
+		nil,
+		true,
+	},
 }
 
 func NewVM(chunk *Chunk, stackSize Pos, callstackSize Pos) *VM {
@@ -813,9 +853,7 @@ func (vm *VM) Call(v Value, args []Value) (Value, error) {
 		for vm.chunk.Bytecode[vm.ip] != InstructionReturn && vm.Next() {
 		}
 
-		if vm.HasNext() {
-			vm.Next()
-		}
+		vm.Next()
 
 		return vm.stack.Pop(), nil
 

emoji.ang

@@ -0,0 +1,2 @@
+
+write(char(0x12) + char(0x85) + char(0x07))

examples/recursive.ang

@@ -1,15 +1,14 @@
-
-# fibonacci sequence
-func fib(n) {
-    if n <= 1 {
-        return n
-    }
-
-    return fib(n - 1) + fib(n - 2)
+# This program computes the fibonacci numbers using recursion (O(2^n))
+# It is very slow
+func fib(x: number) number {
+	if x <= 1 {
+		return x
+	}
+	return fib(x - 1) + fib(x - 2)
 }
 
 n := 0
-while n < 10 {
-    write(fib(n))
-    n = n + 1
+while n < 100 {
+	write(str(fib(n)))
+	n = n + 1
 }

examples/solving.ang

@@ -0,0 +1,13 @@
+import "../lib/math.ang"
+
+a := 120
+b := 10
+
+# find log_b(a)
+func f(x: number)number {
+    return pow(b, x) - a
+}
+
+log_b := newtons(f)
+write(str(log_b))
+write("inverse: "+str(pow(b, log_b))+" = "+str(a))

fails.ang

@@ -0,0 +1,4 @@
+import "lib/honning.ang"
+
+write(_bell+_italic+"Hello "+_underline+"world "+_strike+"micheal"+_reset)
+

imp.ang

@@ -0,0 +1,15 @@
+
+func is_cool(x: number|string) boolean {
+    if x == "cool" {
+        return true
+    } else if x == 69 {
+        return true
+    }
+
+    return nil
+}
+
+write(str(is_cool("not cool")))
+write(str(is_cool("cool")))
+write(str(is_cool(0)))
+write(str(is_cool(69)))

lib/honning.ang

@@ -0,0 +1,15 @@
+
+_bell := char(0x07)
+
+ESC := char(0x1B)
+CSI := ESC + "["
+
+_reset := CSI + "0m"
+_bold := CSI + "1m"
+_faint := CSI + "2m"
+_italic := CSI + "3m"
+_underline := CSI + "4m"
+_slow_blink := CSI + "5m"
+_rapid_blink := CSI + "6m"
+_strike := CSI + "9m"
+_primary_font := CSI + "10m"

lib/math.ang

@@ -17,6 +17,24 @@ func abs(x: number) number {
     return x
 }
 
+DERIVE_DX := 0.00000001
+func derive(f: func(number)number, x: number) number {
+    return (f(x + DERIVE_DX) - f(x))/DERIVE_DX
+}
+
+NEWTONS_ACC := 0.000000000001
+func newtons(f: func(number)number) number {
+    pg := 0
+    g := 1
+
+    while abs(g - pg) > NEWTONS_ACC {
+        pg = g
+        g = pg - f(pg) / derive(f, pg)
+    }
+
+    return g
+}
+
 MAX_SQRT_DX := 0.0000001
 
 # sqrt(x)
@@ -42,18 +60,14 @@ func sqrt(x: number) number {
 #   Return the whole number part of the number. if x is a whole number,
 #   the returned value is x. If x is not a whole number, the closest
 #   whole number which is less than or equal to x is returned.
-func floor(x: number) number {
-    # todo
-}
+
 
 # ceil(x)
 # x: number
 #   Return the whole number part of the number. if x is a whole number,
 #   the returned value is x. If x is not a whole number, the closest
 #   whole number which is greater than or equal to x is returned.
-func ceil(x: number) number {
-    # todo
-}
+
 
 # round(x)
 # x: number
@@ -72,7 +86,7 @@ func round(x: number) number {
 # x: number; any number
 # n: number; the number to divide by
 #   Return the rest from a division of x by n.
-func mod(x: number, n: number) {
+func mod(x: number, n: number) number {
     if x == 0 {
         return 0
     }
@@ -136,6 +150,23 @@ func exp(x: number) number {
     }
 }
 
+# ln(x)
+# x: number; any number
+#   Get the approximate value of the natural logarithm
+#   This function uses newton's method to approximate.
+LN_ACC := 0.0000000001
+func ln(x: number) number {
+    pg := 0
+    g := 1
+
+    while abs(pg - g) > LN_ACC {
+        pg = g
+        g = pg + x / exp(pg) - 1
+    }
+
+    return g
+}
+
 # pow(x, p)
 # x: number; any number. The base
 # p: number; the value of the exponent
@@ -144,18 +175,21 @@ func pow(x: number, p: number) number {
     return exp(p*ln(x))
 }
 
-# ln(x)
-# x: number; any number
-#   Get the approximate value of the natural logarithm
-#   This function uses newton's method to approximate.
-LN_ACC := 0.000000001
-func ln(x: number) number {
+# log(x, b)
+# x: number; any number greater than 0
+# b: number; any number as the base
+#   Calculate the approximate value of the logarithm
+#   of a with b as base.
+LOG_ACC := 0.0000001
+func log(a: number, b: number) number {
+    ln_b := ln(b)
+
     pg := 0
     g := 1
 
-    while abs(pg - g) > LN_ACC {
+    while abs(g - pg) > LOG_ACC {
         pg = g
-        g = pg + x / exp(pg) - 1
+        g = pg - 1/ln_b - a/(ln_b*pow(b, pg))
     }
 
     return g

test_all.sh

@@ -38,9 +38,9 @@ done
 
 
 if [ 0 -ne "$(wc -w <<< "${errors[@]}")" ]; then
-  echo "== Errors occured while executing =="
+  echo "=x= Errors occured while executing =x="
   echo "erroring files: $(printf '%s ' "${errors[@]}")"
   exit 1
 else
-  echo '== Successfully ran all tests =='
+  echo '=+= Successfully ran all tests =+='
 fi

tests/conditions.ang

@@ -3,9 +3,8 @@ assertEq(1, 1)
 assertEq(0, 0)
 assertEq("", "")
 
-assertEq([], [])
+assertEq([]number, []number)
 assertEq([3, 1, 4, 1], [3, 1, 4, 1])
-assertEq([true, 1024, nil, "Hello world!"], [true, 1024, nil, "Hello world!"])
 
 # Inequality
 assertNotEq(2, 3)

tests/list.ang

@@ -1,4 +1,4 @@
-list := []
+list := []number
 
 x := 1
 while x <= 1000 {
@@ -14,7 +14,7 @@ func sum(a: number, b: number) number {
     return a + b
 }
 
-list = []
+list = []number
 x = 1
 while x <= 100 {
     list.append(2*x - 1)

tests/refs.ang

@@ -1,5 +1,5 @@
 
-list := []
+list := []number
 
 list.append(1)
 list.append(2)

tests/scope.ang

@@ -4,9 +4,12 @@ a := 2
 {
     a := 3
     assertEq(a, 3)
+    breakpoint
 
     a = 4
     assertEq(a, 4)
+    breakpoint
 }
 
 assertEq(a, 2)
+breakpoint