powershell: merge eval-ast and fix a few tests

Update Dockerfile and run for Ubuntu/24.04 and powershell/7.4.5. Fix (false? 1) and (true? 0). Change the type of the env.{find,get,set} key to a raw string. Merge eval-ast into EVAL. Implement DEBUG-EVAL. Prevent defmacro! from mutating the original function.
kanaka · Aug 26, 2024 · 1afe9ee · 1afe9ee
1 parent 87b283a
commit 1afe9ee
Show file tree

Hide file tree

Showing 13 changed files with 225 additions and 277 deletions.
diff --git a/impls/powershell/Dockerfile b/impls/powershell/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,16 +19,10 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# Nothing additional needed for python
-RUN apt-get -y install libunwind8 libicu52
-#RUN apt-get -y install libunwind8 libicu55
-
-# For dist packaging
-RUN curl -L -O https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell_6.0.0-alpha.9-1ubuntu1.14.04.1_amd64.deb && \
-    dpkg -i powershell_6.0.0-alpha.9-1ubuntu1.14.04.1_amd64.deb && \
-    rm powershell_6.0.0-alpha.9-1ubuntu1.14.04.1_amd64.deb
-#RUN curl -L -O https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.9/powershell_6.0.0-alpha.9-1ubuntu1.16.04.1_amd64.deb && \
-#    dpkg -i powershell_6.0.0-alpha.9-1ubuntu1.16.04.1_amd64.deb && \
-#    rm powershell_6.0.0-alpha.9-1ubuntu1.16.04.1_amd64.deb
+RUN apt-get-y install ca-certificates curl
+RUN curl -L -O \
+    https://github.com/PowerShell/PowerShell/releases/download/v7.4.5/powershell_7.4.5-1.deb_amd64.deb && \
+    dpkg -i powershell_7.4.5-1.deb_amd64.deb && \
+    rm powershell_7.4.5-1.deb_amd64.deb
 
 ENV HOME=/mal
diff --git a/impls/powershell/core.psm1 b/impls/powershell/core.psm1
@@ -109,8 +109,8 @@ $core_ns = @{
     "throw"       = Get-Command mal_throw;
 
     "nil?"        = { param($a); $a -eq $null };
-    "true?"       = { param($a); $a -eq $true };
-    "false?"      = { param($a); $a -eq $false };
+    "true?"       = { param($a); $a -is [Boolean] -and $a -eq $true };
+    "false?"      = { param($a); $a -is [Boolean] -and $a -eq $false };
     "number?"     = { param($a); $a -is [int32] };
     "string?"     = { param($a); string? $a };
     "symbol"      = Get-Command new-symbol;

diff --git a/impls/powershell/env.psm1 b/impls/powershell/env.psm1
@@ -27,12 +27,12 @@ Class Env {
     }
 
     [Object] set($key, $value) {
-        $this.data[$key.value] = $value
+        $this.data[$key] = $value
         return $value
     }
 
     [Env] find($key) {
-        if ($this.data.Contains($key.value)) {
+        if ($this.data.Contains($key)) {
             return $this
         } elseif ($this.outer -ne $null) {
             return $this.outer.find($key)
@@ -44,9 +44,9 @@ Class Env {
     [Object] get($key) {
         $e = $this.find($key)
         if ($e -ne $null) {
-            return $e.data[$key.value]
+            return $e.data[$key]
         } else {
-            throw "'$($key.value)' not found"
+            throw "'$($key)' not found"
         }
     }
 }

diff --git a/impls/powershell/run b/impls/powershell/run
@@ -1,2 +1,2 @@
-#!/bin/bash
-exec powershell $(dirname $0)/${STEP:-stepA_mal}.ps1 "${@}"
+#!/bin/sh
+exec pwsh $(dirname $0)/${STEP:-stepA_mal}.ps1 "${@}"
diff --git a/impls/powershell/step2_eval.ps1 b/impls/powershell/step2_eval.ps1
@@ -10,11 +10,13 @@ function READ([String] $str) {
 }
 
 # EVAL
-function eval_ast($ast, $env) {
+function EVAL($ast, $env) {
+    # Write-Host "EVAL: $(pr_str $ast)"
+
     if ($ast -eq $null) { return $ast }
     switch ($ast.GetType().Name) {
         "Symbol"  { return $env[$ast.value] }
-        "List"    { return new-list @($ast.values | ForEach-Object { EVAL $_ $env }) }
+        "List" { }  # continue after the switch
         "Vector"  { return new-vector @($ast.values | ForEach-Object { EVAL $_ $env }) }
         "HashMap" {
             $hm = new-hashmap @()
@@ -25,18 +27,11 @@ function eval_ast($ast, $env) {
         }
         default   { return $ast }
     }
-}
 
-function EVAL($ast, $env) {
-    # Write-Host "EVAL: $(pr_str $ast)"
-    if ($ast -eq $null) { return $ast }
-    if (-not (list? $ast)) {
-        return (eval_ast $ast $env)
-    }
     if (empty? $ast) { return $ast }
 
-    $el = (eval_ast $ast $env)
-    $f, $fargs = $el.first(), $el.rest().values
+    $f = ( EVAL $ast.first() $env )
+    $fargs = @($ast.rest().values | ForEach-Object { EVAL $_ $env })
     return &$f @fargs
 }
 

diff --git a/impls/powershell/step3_env.ps1 b/impls/powershell/step3_env.ps1
@@ -11,11 +11,21 @@ function READ([String] $str) {
 }
 
 # EVAL
-function eval_ast($ast, $env) {
+function EVAL($ast, $env) {
+
+    $dbgeval_env = ($env.find("DEBUG-EVAL"))
+    if ($dbgeval_env -ne $null) {
+        $dbgeval = $dbgeval_env.get("DEBUG-EVAL")
+        if ($dbgeval -ne $null -and
+            -not ($dbgeval -is [Boolean] -and $dbgeval -eq $false)) {
+            Write-Host "EVAL: $(pr_str $ast)"
+        }
+    }
+
     if ($ast -eq $null) { return $ast }
     switch ($ast.GetType().Name) {
-        "Symbol"  { return $env.get($ast) }
-        "List"    { return new-list @($ast.values | ForEach-Object { EVAL $_ $env }) }
+        "Symbol"  { return $env.get($ast.value) }
+        "List" { }  # continue after the switch
         "Vector"  { return new-vector @($ast.values | ForEach-Object { EVAL $_ $env }) }
         "HashMap" {
             $hm = new-hashmap @()
@@ -26,31 +36,24 @@ function eval_ast($ast, $env) {
         }
         default   { return $ast }
     }
-}
 
-function EVAL($ast, $env) {
-    # Write-Host "EVAL: $(pr_str $ast)"
-    if ($ast -eq $null) { return $ast }
-    if (-not (list? $ast)) {
-        return (eval_ast $ast $env)
-    }
     if (empty? $ast) { return $ast }
 
     $a0, $a1, $a2 = $ast.nth(0), $ast.nth(1), $ast.nth(2)
     switch -casesensitive ($a0.value) {
         "def!" {
-            return $env.set($a1, (EVAL $a2 $env)) 
+            return $env.set($a1.value, (EVAL $a2 $env))
         }
         "let*" {
             $let_env = new-env $env
             for ($i=0; $i -lt $a1.values.Count; $i+=2) {
-                $_ = $let_env.set($a1.nth($i), (EVAL $a1.nth(($i+1)) $let_env))
+                $_ = $let_env.set($a1.nth($i).value, (EVAL $a1.nth(($i+1)) $let_env))
             }
             return EVAL $a2 $let_env
         }
         default {
-            $el = (eval_ast $ast $env)
-            $f, $fargs = $el.first(), $el.rest().values
+            $f = ( EVAL $ast.first() $env )
+            $fargs = @($ast.rest().values | ForEach-Object { EVAL $_ $env })
             return &$f @fargs
         }
     }
@@ -63,10 +66,10 @@ function PRINT($exp) {
 
 # REPL
 $repl_env = new-env
-$_ = $repl_env.set((new-symbol "+"), { param($a, $b); $a + $b })
-$_ = $repl_env.set((new-symbol "-"), { param($a, $b); $a - $b })
-$_ = $repl_env.set((new-symbol "*"), { param($a, $b); $a * $b })
-$_ = $repl_env.set((new-symbol "/"), { param($a, $b); $a / $b })
+$_ = $repl_env.set("+", { param($a, $b); $a + $b })
+$_ = $repl_env.set("-", { param($a, $b); $a - $b })
+$_ = $repl_env.set("*", { param($a, $b); $a * $b })
+$_ = $repl_env.set("/", { param($a, $b); $a / $b })
 
 function REP([String] $str) {
     return PRINT (EVAL (READ $str) $repl_env)

diff --git a/impls/powershell/step4_if_fn_do.ps1 b/impls/powershell/step4_if_fn_do.ps1
@@ -12,11 +12,21 @@ function READ([String] $str) {
 }
 
 # EVAL
-function eval_ast($ast, $env) {
+function EVAL($ast, $env) {
+
+    $dbgeval_env = ($env.find("DEBUG-EVAL"))
+    if ($dbgeval_env -ne $null) {
+        $dbgeval = $dbgeval_env.get("DEBUG-EVAL")
+        if ($dbgeval -ne $null -and
+            -not ($dbgeval -is [Boolean] -and $dbgeval -eq $false)) {
+            Write-Host "EVAL: $(pr_str $ast)"
+        }
+    }
+
     if ($ast -eq $null) { return $ast }
     switch ($ast.GetType().Name) {
-        "Symbol"  { return $env.get($ast) }
-        "List"    { return new-list @($ast.values | ForEach-Object { EVAL $_ $env }) }
+        "Symbol"  { return $env.get($ast.value) }
+        "List" { }  # continue after the switch
         "Vector"  { return new-vector @($ast.values | ForEach-Object { EVAL $_ $env }) }
         "HashMap" {
             $hm = new-hashmap @()
@@ -27,30 +37,26 @@ function eval_ast($ast, $env) {
         }
         default   { return $ast }
     }
-}
 
-function EVAL($ast, $env) {
-    # Write-Host "EVAL: $(pr_str $ast)"
-    if ($ast -eq $null) { return $ast }
-    if (-not (list? $ast)) {
-        return (eval_ast $ast $env)
-    }
     if (empty? $ast) { return $ast }
 
     $a0, $a1, $a2 = $ast.nth(0), $ast.nth(1), $ast.nth(2)
     switch -casesensitive ($a0.value) {
         "def!" {
-            return $env.set($a1, (EVAL $a2 $env)) 
+            return $env.set($a1.value, (EVAL $a2 $env))
         }
         "let*" {
             $let_env = new-env $env
             for ($i=0; $i -lt $a1.values.Count; $i+=2) {
-                $_ = $let_env.set($a1.nth($i), (EVAL $a1.nth(($i+1)) $let_env))
+                $_ = $let_env.set($a1.nth($i).value, (EVAL $a1.nth(($i+1)) $let_env))
             }
             return EVAL $a2 $let_env
         }
         "do" {
-            return (eval_ast $ast.rest() $env).last()
+            for ($i=1; $i -lt ($ast.values.Count - 1); $i+=1) {
+                $_ = (EVAL $ast.values[$i] $env)
+            }
+            return (EVAL $ast.values[$i] $env)
         }
         "if" {
             $cond = (EVAL $a1 $env)
@@ -69,8 +75,8 @@ function EVAL($ast, $env) {
             }.GetNewClosure()
         }
         default {
-            $el = (eval_ast $ast $env)
-            $f, $fargs = $el.first(), $el.rest().values
+            $f = ( EVAL $ast.first() $env )
+            $fargs = @($ast.rest().values | ForEach-Object { EVAL $_ $env })
             return &$f @fargs
         }
     }
@@ -90,7 +96,7 @@ function REP([String] $str) {
 
 # core.EXT: defined using PowerShell
 foreach ($kv in $core_ns.GetEnumerator()) {
-    $_ = $repl_env.set((new-symbol $kv.Key), $kv.Value)
+    $_ = $repl_env.set($kv.Key, $kv.Value)
 }
 
 # core.mal: defined using the language itself

diff --git a/impls/powershell/step5_tco.ps1 b/impls/powershell/step5_tco.ps1
@@ -12,11 +12,23 @@ function READ([String] $str) {
 }
 
 # EVAL
-function eval_ast($ast, $env) {
+function EVAL($ast, $env) {
+
+  while ($true) {
+
+    $dbgeval_env = ($env.find("DEBUG-EVAL"))
+    if ($dbgeval_env -ne $null) {
+        $dbgeval = $dbgeval_env.get("DEBUG-EVAL")
+        if ($dbgeval -ne $null -and
+            -not ($dbgeval -is [Boolean] -and $dbgeval -eq $false)) {
+            Write-Host "EVAL: $(pr_str $ast)"
+        }
+    }
+
     if ($ast -eq $null) { return $ast }
     switch ($ast.GetType().Name) {
-        "Symbol"  { return $env.get($ast) }
-        "List"    { return new-list @($ast.values | ForEach-Object { EVAL $_ $env }) }
+        "Symbol"  { return $env.get($ast.value) }
+        "List" { }  # continue after the switch
         "Vector"  { return new-vector @($ast.values | ForEach-Object { EVAL $_ $env }) }
         "HashMap" {
             $hm = new-hashmap @()
@@ -27,36 +39,27 @@ function eval_ast($ast, $env) {
         }
         default   { return $ast }
     }
-}
 
-function EVAL($ast, $env) {
-  while ($true) {
-    # Write-Host "EVAL: $(pr_str $ast)"
-    if ($ast -eq $null) { return $ast }
-    if (-not (list? $ast)) {
-        return (eval_ast $ast $env)
-    }
     if (empty? $ast) { return $ast }
 
     $a0, $a1, $a2 = $ast.nth(0), $ast.nth(1), $ast.nth(2)
     switch -casesensitive ($a0.value) {
         "def!" {
-            return $env.set($a1, (EVAL $a2 $env)) 
+            return $env.set($a1.value, (EVAL $a2 $env))
         }
         "let*" {
             $let_env = new-env $env
             for ($i=0; $i -lt $a1.values.Count; $i+=2) {
-                $_ = $let_env.set($a1.nth($i), (EVAL $a1.nth(($i+1)) $let_env))
+                $_ = $let_env.set($a1.nth($i).value, (EVAL $a1.nth(($i+1)) $let_env))
             }
             $env = $let_env
             $ast = $a2  # TCO
         }
         "do" {
-            if ($ast.values.Count -gt 2) {
-                $middle = new-list $ast.values[1..($ast.values.Count-2)]
-                $_ = eval_ast $middle $env
+            for ($i=1; $i -lt ($ast.values.Count - 1); $i+=1) {
+                $_ = (EVAL $ast.values[$i] $env)
             }
-            $ast = $ast.last()  # TCO
+            $ast = $ast.values[$i]  # TCO
         }
         "if" {
             $cond = (EVAL $a1 $env)
@@ -76,8 +79,8 @@ function EVAL($ast, $env) {
             return new-malfunc $a2 $a1.values $env $fn
         }
         default {
-            $el = (eval_ast $ast $env)
-            $f, $fargs = $el.first(), $el.rest().values
+            $f = ( EVAL $ast.first() $env )
+            $fargs = @($ast.rest().values | ForEach-Object { EVAL $_ $env })
             if (malfunc? $f) {
                 $env = (new-env $f.env $f.params $fargs)
                 $ast = $f.ast  # TCO
@@ -103,7 +106,7 @@ function REP([String] $str) {
 
 # core.EXT: defined using PowerShell
 foreach ($kv in $core_ns.GetEnumerator()) {
-    $_ = $repl_env.set((new-symbol $kv.Key), $kv.Value)
+    $_ = $repl_env.set($kv.Key, $kv.Value)
 }
 
 # core.mal: defined using the language itself