fixes for regex

diff --git a/src/core/dictionary.slate b/src/core/dictionary.slate
index 8adac58..5aa1d3e 100644 (file)
--- a/src/core/dictionary.slate
+++ b/src/core/dictionary.slate
@@ -174,6 +174,8 @@ d@(Dictionary traits) keySet
   result
 ].
 
+d@(Dictionary traits) keys [d keySet].
+
 d@(Dictionary traits) valueSet
 [| result |
   result: (Set newSizeOf: d).
@@ -182,6 +184,8 @@ d@(Dictionary traits) valueSet
   result
 ].
 
+d@(Dictionary traits) values [d valueSet].
+
 d@(Dictionary traits) keysAndValuesDo: block
 [
   d isEmpty ifTrue: [^ d].

diff --git a/src/lib/regex.slate b/src/lib/regex.slate
index af6520d..710d140 100644 (file)
--- a/src/lib/regex.slate
+++ b/src/lib/regex.slate
@@ -277,12 +277,11 @@ m@(Regex Matcher traits) subexpressionMatches
 
 m@(Regex Matcher traits) subexpressionMatchesArray
 [ | matches |
-  matches: (ExtensibleArray new &capacity: m subexpressions keys max + 1).
-  m subexpression keysDo: [|:key | matches at: key put: (m subexpression: key)].
+  matches: (Array new &capacity: m subexpressions keys max + 1).
+  m subexpressions keysDo: [|:key | matches at: key put: (m subexpression: key)].
   matches
 ].
 
-
 m@(Regex Matcher traits) matches: node
 [
   (m match: node) ~= Regex Matcher Fail