More efficient binary parsing.

1 files changed, 25 insertions, 15 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
index 32c57de4e..ab9ed4837 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
@@ -9,7 +9,7 @@
      ["<[0]>" code {"+" Parser}]]]
    [data
     [collection
-     ["[0]" array {"+" Array}]
+     ["[0]" array]
      ["[0]" dictionary]
      ["[0]" list]]]
    ["[0]" type
@@ -32,11 +32,13 @@
    [<code>.any
     (function (_ extension phase archive lengthC)
       (<| analysis/type.with_var
-          (function (_ [@var :var:]))
+          (function (_ [@read :read:]))
+          analysis/type.with_var
+          (function (_ [@write :write:]))
           (do phase.monad
             [lengthA (<| (analysis/type.expecting Nat)
                          (phase archive lengthC))
-             _ (analysis/type.inference (type (Array :var:)))]
+             _ (analysis/type.inference (type (array.Array' :read: :write:)))]
             (in {analysis.#Extension extension (list lengthA)}))))]))
 
 (def: array::length
@@ -45,9 +47,11 @@
    [<code>.any
     (function (_ extension phase archive arrayC)
       (<| analysis/type.with_var
-          (function (_ [@var :var:]))
+          (function (_ [@read :read:]))
+          analysis/type.with_var
+          (function (_ [@write :write:]))
           (do phase.monad
-            [arrayA (<| (analysis/type.expecting (type (Array :var:)))
+            [arrayA (<| (analysis/type.expecting (type (array.Array' :read: :write:)))
                         (phase archive arrayC))
              _ (analysis/type.inference Nat)]
             (in {analysis.#Extension extension (list arrayA)}))))]))
@@ -58,13 +62,15 @@
    [(<>.and <code>.any <code>.any)
     (function (_ extension phase archive [indexC arrayC])
       (<| analysis/type.with_var
-          (function (_ [@var :var:]))
+          (function (_ [@read :read:]))
+          analysis/type.with_var
+          (function (_ [@write :write:]))
           (do phase.monad
             [indexA (<| (analysis/type.expecting Nat)
                         (phase archive indexC))
-             arrayA (<| (analysis/type.expecting (type (Array :var:)))
+             arrayA (<| (analysis/type.expecting (type (array.Array' :read: :write:)))
                         (phase archive arrayC))
-             _ (analysis/type.inference :var:)]
+             _ (analysis/type.inference :read:)]
             (in {analysis.#Extension extension (list indexA arrayA)}))))]))
 
 (def: array::write
@@ -73,15 +79,17 @@
    [($_ <>.and <code>.any <code>.any <code>.any)
     (function (_ extension phase archive [indexC valueC arrayC])
       (<| analysis/type.with_var
-          (function (_ [@var :var:]))
+          (function (_ [@read :read:]))
+          analysis/type.with_var
+          (function (_ [@write :write:]))
           (do phase.monad
             [indexA (<| (analysis/type.expecting Nat)
                         (phase archive indexC))
-             valueA (<| (analysis/type.expecting :var:)
+             valueA (<| (analysis/type.expecting :write:)
                         (phase archive valueC))
-             arrayA (<| (analysis/type.expecting (type (Array :var:)))
+             arrayA (<| (analysis/type.expecting (type (array.Array' :read: :write:)))
                         (phase archive arrayC))
-             _ (analysis/type.inference (type (Array :var:)))]
+             _ (analysis/type.inference (type (array.Array' :read: :write:)))]
             (in {analysis.#Extension extension (list indexA valueA arrayA)}))))]))
 
 (def: array::delete
@@ -90,13 +98,15 @@
    [($_ <>.and <code>.any <code>.any)
     (function (_ extension phase archive [indexC arrayC])
       (<| analysis/type.with_var
-          (function (_ [@var :var:]))
+          (function (_ [@read :read:]))
+          analysis/type.with_var
+          (function (_ [@write :write:]))
           (do phase.monad
             [indexA (<| (analysis/type.expecting Nat)
                         (phase archive indexC))
-             arrayA (<| (analysis/type.expecting (type (Array :var:)))
+             arrayA (<| (analysis/type.expecting (type (array.Array' :read: :write:)))
                         (phase archive arrayC))
-             _ (analysis/type.inference (type (Array :var:)))]
+             _ (analysis/type.inference (type (array.Array' :read: :write:)))]
             (in {analysis.#Extension extension (list indexA arrayA)}))))]))
 
 (def: bundle::array