Passage local: → var (2)

lib/moi/util/common.elv

@@ -20,16 +20,16 @@ edit:add-var abs~ [n]{
 }
 
 edit:add-var sum~ [@numbers]{
-  local:s = 0
+  var s = 0
   each [e]{ s = (+ $s e) } (to-list $numbers)
 }
 
 fn -minmax [t @numbers]{
-  local:l = (to-list $@numbers)
+  var l = (to-list $@numbers)
   if (== (count $l) 0) {
     return
   }
-  local:m = $l[0]
+  var m = $l[0]
   each [n]{
     if ($t $n $m) {
         m = $n

lib/moi/util/condition.elv

@@ -11,7 +11,7 @@ fn mset [c t f]{
 }
 
 fn call [c t f @argv]{
-  local:v = (cset $c $t $f)
+  var v = (cset $c $t $f)
   if (is (kind-of $v) fn) {
     $v $@argv
   } else {

lib/moi/util/file.elv

@@ -13,8 +13,8 @@ search-type = [
 ]
 
 fn -less [f1 f2]{
-  local:fl1 local:fl2 = (str:to-lower $f1) (str:to-lower $f2)
-  local:c = (str:compare $fl1 $fl2)
+  var fl1 fl2 = (str:to-lower $f1) (str:to-lower $f2)
+  var c       = (str:compare $fl1 $fl2)
   if (== $c 0) {
     c = (str:compare $f1 $f2)
   }
@@ -30,16 +30,15 @@ fn -get-results [sort result]{
 }
 
 fn -search [&sort=$false &type=exact @motive]{
-  local:f = $search-type[$type]
-  local:result = [&]
+  var f result = $search-type[$type] [&]
   if (list:empty $motive) {
     result = (put * | map:to-set)
   } else {
     peach [m]{
-      local:m = $m
+      var m = $m
       try {
         $f $m | peach [e]{
-          local:e = $e
+          var e = $e
           result[$e] = $nil
         }
       } except e { }
@@ -53,7 +52,7 @@ fn match-files [&sort=$false &type=prefix @motive]{ -search &sort=$sort &type=$t
 fn match-extensions [&sort=$false &type=deep-prefix motive @extensions]{
   result = [&]
   -search &type=$type $motive | peach [f]{
-    local:f = $f
+    var f = $f
     if (list:contains [e]{ str:has-suffix $f .$e } $extensions) {
       result[$f] = $nil
     }

lib/moi/util/ip.elv

@@ -11,9 +11,9 @@ fn is-ipv4 [arg]{
 }
 
 fn is-ipv6 [arg]{
-  local:p = '[0-9a-fA-F]{1,4}'
-  local:g1 local:g2 = '('$p':)' '(:'$p')'
-  local:cases = [
+  var p     = '[0-9a-fA-F]{1,4}'
+  var g1 g2 = '('$p':)' '(:'$p')'
+  var cases = [
     $g1'{7,7}'$p
     $g1'{1,7}:'
     $g1'{1,6}:'$p
@@ -25,7 +25,7 @@ fn is-ipv6 [arg]{
     ':'$g2'{1,7}'
     '::'
   ]
-  local:r = '^('(str:join '|'  $cases)')$'
+  var r = '^('(str:join '|'  $cases)')$'
   put (re:match $r $arg)
 }
 
@@ -47,8 +47,8 @@ fn -middle-part6 [p]{
 
 fn -find-max0 [parts]{
   use ./list
-  local:idx local:s = -1 1
-  local:ci local:cs local:f = -1 0 $false
+  var idx s   = -1 1
+  var ci cs f = -1 0 $false
   list:loop [i p]{
     if (eq $p 0) {
       condition:call $f { cs = (+ $cs 1) } { ci cs f = $i 1 $true }
@@ -73,11 +73,11 @@ fn long6 [ip]{
     repeat 8 '0000' | str:join ':'
     return
   }
-  local:c = (- 7 (str:count $ip ':'))
+  var c = (- 7 (str:count $ip ':'))
   if (> $c 0) {
-    local:i = (str:index $ip '::')
-    local:z = (repeat $c ':' | str:join '')
-    ip = (str:join '' [$ip[..$i] $z $ip[{$i}..]])
+    var i = (str:index $ip '::')
+    var z = (repeat $c ':' | str:join '')
+    ip    = (str:join '' [$ip[..$i] $z $ip[{$i}..]])
   }
   str:split ':' $ip | each $-long-part6~ | str:join ':'
 }
@@ -87,10 +87,10 @@ fn middle6 [ip]{
 }
 
 fn short6 [ip]{
-  local:parts = [(str:split ':' (middle6 $ip))]
-  local:i local:s = (-find-max0 $parts)
+  var parts = [(str:split ':' (middle6 $ip))]
+  var i s   = (-find-max0 $parts)
   if (>= $i 0) {
-    local:left local:right = $parts[..$i] $parts[(+ $i $s)..]
+    var left right = $parts[..$i] $parts[(+ $i $s)..]
     if (== (count $left) 0) {
       left = ['']
     }
@@ -107,9 +107,9 @@ fn is-ip [arg]{ or (is-ipv4 $arg) (is-ipv6 $arg) }
 fn -cmp [e1 e2]{
   use ./list
   use ./condition
-  local:c = 0
+  var c = 0
   list:loop [i p1]{
-    local:p2 = $e2[$i]
+    var p2 = $e2[$i]
     c = (condition:cset (< $p1 $p2) -1 (condition:cset (> $p1 $p2) 1 0))
     if (!= $c 0) {
       break

lib/moi/util/map.elv

@@ -12,21 +12,21 @@ fn value-of [container k &default=$nil]{
 }
 
 fn unzip [container]{
-  local:lkeys local:lvalues = [] []
+  var lkeys lvalues = [] []
   keys $container | each [k]{
-    lkeys = [(all $lkeys) $k]
+    lkeys   = [(all $lkeys) $k]
     lvalues = [(all $lvalues) $container[$k]]
   }
   put $lkeys $lvalues
 }
 
 fn zip [lkeys lvalues]{
-  local:ck local:cv = (count $lkeys) (count $lvalues)
-  local:c = $ck
+  var ck cv = (count $lkeys) (count $lvalues)
+  var c = $ck
   if (> $ck $cv) {
     c = $cv
   }
-  local:result = [&]
+  var result = [&]
   range $c | peach [i]{
     put [&k=$lkeys[$i] &i=$i]
   } | peach [e]{
@@ -39,13 +39,13 @@ fn zip [lkeys lvalues]{
 
 fn to-map [@argv]{
   use ./list
-  local:container = (list:to-list $@argv)
+  var container = (list:to-list $@argv)
   zip [(range (count $container))] $container
 }
 
 fn to-set [@argv]{
   use ./list
-  local:m = [&]
+  var m = [&]
   each [k]{ m[$k] = $nil } (list:to-list $@argv)
   put $m
 }
@@ -59,7 +59,7 @@ fn mdissoc [container @argv]{
 
 fn massoc [&replace=$true container @argv]{
   each [e]{
-    local:k local:v = $@e
+    var k v = $@e
     if (or $replace (not (has-key $container $k))) {
       container[$k] = $v
     }
@@ -69,7 +69,7 @@ fn massoc [&replace=$true container @argv]{
 
 fn add [container key @values]{
   use ./list
-  local:values = (list:to-list $values)
+  var values = (list:to-list $values)
   if (has-key $container $key) {
     container[$key] = [(all $container[$key]) $@values]
   } else {

lib/moi/util/option.elv

@@ -11,7 +11,7 @@ fn -splitm [o]{ each [e]{ put -$e } $o[1:] }
 
 fn -splitl [o]{
   if (str:contains $o '=') {
-    local:opt @local:value = (str:split '=' $o)
+    var opt @value = (str:split '=' $o)
     put $opt
     str:join '=' $value
   } else {
@@ -30,15 +30,15 @@ fn split [o]{
 }
 
 fn -joins [opt]{
-  local:o = (each [o]{ put $o[1:] } $opt | str:join '')
+  var o = (each [o]{ put $o[1:] } $opt | str:join '')
   if (not-eq $o '') { put -$o }
 }
 
 fn join [@opt]{
-  local:opt = (list:-p $@opt)
-  local:cb = [o]{ or (is-soption $o) (is-moptions $o) }
-  local:idx = [(list:filter-index-not $cb $opt)]
-  local:i0 = 0
+  var opt = (list:-p $@opt)
+  var cb  = [o]{ or (is-soption $o) (is-moptions $o) }
+  var idx = [(list:filter-index-not $cb $opt)]
+  var i0  = 0
   each [i]{
     -joins $opt[{$i0}:$i]
     put $opt[$i]
@@ -52,14 +52,13 @@ fn expand [@argv]{ each $split~ (list:-p $@argv) }
 fn map [@argv]{
   use ./map
   argv = [(expand $@argv)]
-  local:result = [&]
-  local:i local:c = 0 (count $argv)
+  var result i c = [&] 0 (count $argv)
   while (< $i $c) {
-    local:o = $argv[$i]
+    var o = $argv[$i]
     if (is-option $o) {
-      local:k local:v = $o []
+      var k v = $o []
       if (< $i (- $c 1)) {
-        local:e = $argv[(+ $i 1)]
+        var e = $argv[(+ $i 1)]
         if (not (is-option $e)) {
           v = [$@v $e]
           i = (+ $i 1)

lib/moi/util/strutil.elv

@@ -6,8 +6,8 @@ fn -repeat [n s]{
 }
 
 fn left [size s]{
-  local:ss = (count $s)
-  local:d = (- $size $ss)
+  var ss = (count $s)
+  var d  = (- $size $ss)
   if (<= $d 0) {
     put $s[:$size]
   } else {
@@ -16,8 +16,8 @@ fn left [size s]{
 }
 
 fn right [size s]{
-  local:ss = (count $s)
-  local:d = (- $size $ss)
+  var ss = (count $s)
+  var d  = (- $size $ss)
   if (<= $d 0) {
     put $s[:$size]
   } else {
@@ -27,15 +27,15 @@ fn right [size s]{
 
 fn center [size s]{
   use math
-  local:ss = (count $s)
-  local:d = (- $size $ss)
+  var ss = (count $s)
+  var d  = (- $size $ss)
   if (<= $d 0) {
-    local:l = (math:ceil (/ -$d 2))
-    local:r = (- (+ $ss $d) $l)
+    var l = (math:ceil (/ -$d 2))
+    var r = (- (+ $ss $d) $l)
     put $s[$l':'$r]
   } else {
-    local:l = (math:ceil (/ $d 2))
-    local:r = (- $d $l)
+    var l = (math:ceil (/ $d 2))
+    var r = (- $d $l)
     put (-repeat $l ' ')$s(-repeat $r ' ')
   }
 }
@@ -46,8 +46,8 @@ fn -c2map [col]{
     return
   }
   list:loop [i c]{
-    local:k = (kind-of $c)
-    local:cf = [&min=0]
+    var k  = (kind-of $c)
+    var cf = [&min=0]
     if (is $k string) {
       cf[min] = $c
     } elif (is $k map) {
@@ -65,19 +65,18 @@ fn -c2map [col]{
 
 fn -parsecols [col &split=$false lst]{
   col = (-c2map $col)
-  local:cc = (count $col)
-  local:lines = $lst
+  var cc lines = (count $col) $lst
   if $split {
     lines = [ (eawk [_ @args]{ put $args } $lst) ]
   }
   each [l]{
-    local:cl = (count $l)
+    var cl = (count $l)
     if (> $cl $cc) {
       col = [ $@col (range (- $cl $cc) | each [_]{ put [&align=left &min=0] }) ]
-      cc = $cl
+      cc  = $cl
     }
     list:loop [i c]{
-      local:ccl = (+ (count $c) 1)
+      var ccl = (+ (count $c) 1)
       if (> $ccl $col[$i][min]) {
         col[$i][min] = $ccl
       }
@@ -87,9 +86,9 @@ fn -parsecols [col &split=$false lst]{
 }
 
 fn -format [f e]{
-  local:cb = $left~
+  var cb = $left~
   if (has-key $f align) {
-    local:a = $f[align]
+    var a = $f[align]
     if (is $a right) {
       cb = $right~
     } elif (is $a center) {
@@ -106,7 +105,7 @@ fn -formatline [col line]{
 }
 
 fn format [&col=[] &split=$false @lst]{
-  local:lines = (list:-p $@lst)
+  var lines = (list:-p $@lst)
   if $split {
     lines = [ (eawk [l @args]{ put $args } $lines) ]
   }