Finish all awk examples, add multiplication and division

.github/workflows/dotnet.yml

@@ -22,3 +22,6 @@ jobs:
 
     - name: Test mshell-go
       run:  cd tests && ./test.sh
+
+    - name: Run awk example tests
+      run: cd examples/awk && ./test.sh

README.md

@@ -118,11 +118,11 @@ wt ((toFloat) map sum str wl) each
 # 19. Add up all fields in all lines and print the sum
 # { for (i = 1; i <= NF; i = i + 1) sum = sum + $i }
 # END { print sum }
-wt ((toFloat) map sum) sum wl
+wt ((toFloat) map sum) sum str wl
 
 # 20. Print every line after replacing each field by its absolute value
 # { for (i = 1; i <= NF; i = i + 1) $i = ($i < 0) ? -$i : $i; print }
-wt ((toFloat abs) map wjoin wl) each
+wt ((toFloat abs str) map wjoin wl) each
 
 ```
 
@@ -139,10 +139,11 @@ wt ((toFloat abs) map wjoin wl) each
 
 | Objective | `sh` | `mshell` |
 |-----------|-----|----------|
-| Print the number of files in the current directory | `ls \| wc -l`                                                | `* glob len wl` |
+| Print the number of files in the current directory | `ls \| wc -l`                                                | `"*" glob len wl` |
 | `find`/`xargs`                                     |  `find . -t x -name '*.sh' -print0 \|  xargs -0 mycommand`   | `[mycommand [find . -t x -name "*.sh"]]o;` |
 
 # TODO
 
-- Floating point numbers
+- Type checking
+- Improved error messages
 - Dictionaries

examples/awk/19.awk

@@ -0,0 +1,2 @@
+{ for (i = 1; i <= NF; i = i + 1) sum = sum + $i }
+END { print sum }

examples/awk/19.data

@@ -0,0 +1,3 @@
+1 2 3
+4 5 6
+7 8 9

examples/awk/19.msh

@@ -0,0 +1 @@
+wt ((toFloat) map sum) map sum str wl

examples/awk/2.data

@@ -0,0 +1,20 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20

examples/awk/20.awk

@@ -0,0 +1 @@
+{ for (i = 1; i <= NF; i = i + 1) $i = ($i < 0) ? -$i : $i; print }

examples/awk/20.data

@@ -0,0 +1,3 @@
+1 -2 3
+-4 5 -6
+7 -8 9

examples/awk/20.msh

@@ -0,0 +1 @@
+wt ((toFloat abs str) map wjoin wl) each

examples/awk/test.sh

@@ -21,14 +21,7 @@ data_test() {
 FAIL=0
 
 emp_test 1
-
-if diff <(seq 1 20 | awk -f '2.awk' ) <(seq 1 20 | mshell 2.msh); then
-    printf "2. pass\n"
-else
-    printf "2. fail\n"
-    FAIL=1
-fi
-
+data_test 2
 emp_test 3
 emp_test 4
 data_test 5
@@ -45,5 +38,7 @@ emp_test 15
 emp_test 16
 emp_test 17
 data_test 18
+data_test 19
+data_test 20
 
 exit "$FAIL"

lib/std.msh

@@ -110,3 +110,8 @@ def reverse
     ) loop
     nip # Drop original list
 end
+
+# abs (int|float -- int|float)
+def abs
+    [(dup 0 <) (-1 *)] if
+end

mshell/Evaluator.go

@@ -719,6 +719,75 @@ MainLoop:
                     }
 
                     stack.Push(&MShellBool{strings.Contains(totalStringText, substringText)})
+                } else if t.Lexeme == "/" {
+                    obj1, err := stack.Pop()
+                    if err != nil {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot do '/' operation on an empty stack.\n", t.Line, t.Column))
+                    }
+
+                    obj2, err := stack.Pop()
+                    if err != nil {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot do '/' operation on a stack with only one item.\n", t.Line, t.Column))
+                    }
+
+                    if !obj1.IsNumeric() || !obj2.IsNumeric() {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot divide a %s and a %s.\n", t.Line, t.Column, obj2.TypeName(), obj1.TypeName()))
+                    }
+
+                    switch obj1.(type) {
+                    case *MShellInt:
+                        if obj1.(*MShellInt).Value == 0 {
+                            return FailWithMessage(fmt.Sprintf("%d:%d: Cannot divide by zero.\n", t.Line, t.Column))
+                        }
+                        switch obj2.(type) {
+                        case *MShellInt:
+                            stack.Push(&MShellInt{obj2.(*MShellInt).Value / obj1.(*MShellInt).Value})
+                        case *MShellFloat:
+                            stack.Push(&MShellFloat{float64(obj2.(*MShellFloat).Value) / float64(obj1.(*MShellInt).Value)})
+                        }
+                    case *MShellFloat:
+                        if obj1.(*MShellFloat).Value == 0 {
+                            return FailWithMessage(fmt.Sprintf("%d:%d: Cannot divide by zero.\n", t.Line, t.Column))
+                        }
+
+                        switch obj2.(type) {
+                        case *MShellInt:
+                            stack.Push(&MShellFloat{float64(obj2.(*MShellInt).Value) / obj1.(*MShellFloat).Value})
+                        case *MShellFloat:
+                            stack.Push(&MShellFloat{obj2.(*MShellFloat).Value / obj1.(*MShellFloat).Value})
+                        }
+                    }
+                } else if t.Lexeme == "*" {
+                    obj1, err := stack.Pop()
+                    if err != nil {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot do '*' operation on an empty stack.\n", t.Line, t.Column))
+                    }
+
+                    obj2, err := stack.Pop()
+                    if err != nil {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot do '*' operation on a stack with only one item.\n", t.Line, t.Column))
+                    }
+
+                    if !obj1.IsNumeric() || !obj2.IsNumeric() {
+                        return FailWithMessage(fmt.Sprintf("%d:%d: Cannot multiply a %s and a %s. If you are looking for wildcard glob, you want `\"*\" glob`.\n", t.Line, t.Column, obj2.TypeName(), obj1.TypeName()))
+                    }
+
+                    switch obj1.(type) {
+                    case *MShellInt:
+                        switch obj2.(type) {
+                        case *MShellInt:
+                            stack.Push(&MShellInt{obj2.(*MShellInt).Value * obj1.(*MShellInt).Value})
+                        case *MShellFloat:
+                            stack.Push(&MShellFloat{obj2.(*MShellFloat).Value * float64(obj1.(*MShellInt).Value)})
+                        }
+                    case *MShellFloat:
+                        switch obj2.(type) {
+                        case *MShellInt:
+                            stack.Push(&MShellFloat{float64(obj2.(*MShellInt).Value) * float64(obj1.(*MShellFloat).Value)})
+                        case *MShellFloat:
+                            stack.Push(&MShellFloat{obj2.(*MShellFloat).Value * obj1.(*MShellFloat).Value})
+                        }
+                    }
                 } else if t.Lexeme == "toFloat" {
                     obj, err := stack.Pop()
                     if err != nil {

tests/arithmetic.msh

@@ -0,0 +1,8 @@
+2 3 * str wl
+1.5 2.5 * str wl
+5 2 / str wl
+5.0 2.0 / str wl
+5 2.0 / str wl
+5.0 2 / str wl
+
+-3 abs str wl

tests/arithmetic.msh.stdout

@@ -0,0 +1,7 @@
+6
+3.75
+2
+2.5
+2.5
+2.5
+3