equal
deleted
inserted
replaced
118 type system_configuration = {timeout : Time.time, prolog_system : prolog_system} |
118 type system_configuration = {timeout : Time.time, prolog_system : prolog_system} |
119 |
119 |
120 structure System_Config = Generic_Data |
120 structure System_Config = Generic_Data |
121 ( |
121 ( |
122 type T = system_configuration |
122 type T = system_configuration |
123 val empty = {timeout = Time.fromSeconds 10, prolog_system = SWI_PROLOG} |
123 val empty = {timeout = seconds 10.0, prolog_system = SWI_PROLOG} |
124 val extend = I; |
124 val extend = I; |
125 fun merge ({timeout = timeout1, prolog_system = prolog_system1}, |
125 fun merge ({timeout = timeout1, prolog_system = prolog_system1}, |
126 {timeout = timeout2, prolog_system = prolog_system2}) = |
126 {timeout = timeout2, prolog_system = prolog_system2}) = |
127 {timeout = timeout1, prolog_system = prolog_system1} |
127 {timeout = timeout1, prolog_system = prolog_system1} |
128 ) |
128 ) |