Missed a change last time - also made all_types in function_value_lower a hash_set for a ~20 sec speedup

kraken.krak

@@ -128,8 +128,9 @@ fun main(argc: int, argv: **char):int {
             var line = get_line(string("> "), 100)
             if (line == "end")
                 return 0
-            var trimmed_parse = trim(parse1.parse_input(line, string("stdin")))
-            var ast_expression = ast_pass.transform_expression(trimmed_parse, scope, map<string, *type>())
+            var parse = parse1.parse_input(line, string("stdin"))
+            trim(parse)
+            var ast_expression = ast_pass.transform_expression(parse, scope, map<string, *type>())
             print_value(evaluate_constant_expression(ast_expression))
             /*print_value(evaluate_with_globals(ast_expression, &globals))*/
         }

stdlib/function_value_lower.krak

@@ -34,7 +34,7 @@ fun function_value_lower(name_ast_map: *map<string, pair<*tree<symbol>,*ast_node
     name_ast_map->for_each(fun(name: string, syntax_ast_pair: pair<*tree<symbol>,*ast_node>) {
         lambdas.add(syntax_ast_pair.second->translation_unit.lambdas)
     })
-    var all_types = set<*type>()
+    var all_types = hash_set<*type>()
     var function_value_creation_points = vector<function_parent_block>()
     var function_value_call_points = vector<function_parent_block>()
     var closed_over_uses = vector<pair<*ast_node, pair<*ast_node, *ast_node>>>()

stdlib/hash_set.krak

@@ -2,6 +2,7 @@ import hash_map
 import vector
 import io
 import serialize
+import set
 
 fun hash_set<T>(): hash_set<T> {
     var toRet.construct() : hash_set<T>
@@ -89,9 +90,14 @@ obj hash_set<T> (Object, Serializable) {
     /*fun for_each(func: fun(ref T):void) {*/
         /*data.for_each(func)*/
     /*}*/
-    /*fun for_each(func: fun(T):void) {*/
-        /*data.for_each(func)*/
-    /*}*/
+    fun for_each(func: fun(T):void) {
+        data.for_each(fun(key: T, value: bool) { func(key); })
+    }
+    fun map<U>(func: fun(T):U): set::set<U> {
+        var newSet.construct(size()): set::set<U>
+        for_each(fun(i: T) { newSet.add(func(i)); })
+        return newSet
+    }
     /*fun any_true(func: fun(T):bool):bool {*/
         /*return data.any_true(func)*/
     /*}*/
@@ -109,5 +115,17 @@ obj hash_set<T> (Object, Serializable) {
         /*newSet.data = data.filter(func)*/
         /*return newSet*/
     /*}*/
+    fun chaotic_closure(func: fun(T): set::set<T>) {
+        var prev_size = 0
+        while (prev_size != size()) {
+            prev_size = size()
+            var to_add.construct(size()): vector::vector<T>
+            for_each(fun(i: T) {
+                func(i).for_each(fun(j: T) { to_add.add(j); })
+            })
+            to_add.for_each(fun(i:T) { add(i); })
+        }
+
+    }
 }
 

stdlib/importer.krak

@@ -56,7 +56,7 @@ fun import(file_name: string, parsers: ref vector<parser>, ast_pass: ref ast_tra
     return name_ast_map
 }
 
-fun trim(parse_tree: *tree<symbol>): *tree<symbol> {
+fun trim(parse_tree: *tree<symbol>) {
     remove_node(symbol("$NULL$", false), parse_tree)
     remove_node(symbol("WS", false), parse_tree)
     // the terminals have " around them, which we have to escape
@@ -97,8 +97,6 @@ fun trim(parse_tree: *tree<symbol>): *tree<symbol> {
     collapse_node(symbol("template_param_list", false), parse_tree)
     collapse_node(symbol("trait_list", false), parse_tree)
     collapse_node(symbol("dec_type", false), parse_tree)
-
-    return parse_tree
 }
 fun remove_node(remove: symbol, parse_tree: *tree<symbol>) {
     var to_process = stack<*tree<symbol>>()