aboutsummaryrefslogtreecommitdiff
path: root/sucl
diff options
context:
space:
mode:
authorzweije2001-08-14 14:38:11 +0000
committerzweije2001-08-14 14:38:11 +0000
commit6ec8c3dbbf83e63d9a3bb3dbf35c95f4e0dc358a (patch)
tree34265fbf2b0e7c831f50a9b2f208b5099a65cf04 /sucl
parentThis commit was generated by cvs2svn to compensate for changes in r638, (diff)
This commit was generated by cvs2svn to compensate for changes in r640,
which included commits to RCS files with non-trunk default branches. git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@641 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
Diffstat (limited to 'sucl')
-rw-r--r--sucl/newfold.icl13
-rw-r--r--sucl/newtest.icl4
2 files changed, 11 insertions, 6 deletions
diff --git a/sucl/newfold.icl b/sucl/newfold.icl
index 303f781..c8bb050 100644
--- a/sucl/newfold.icl
+++ b/sucl/newfold.icl
@@ -66,7 +66,12 @@ Deprecated type
> * ->
> trace * ** *** ->
> (bool,([bool],[rule * **],[rgraph * **]))
+*/
+
+:: FunBody sym var
+ :== [Rule sym var]
+/*
Implementation
--------------
@@ -89,7 +94,7 @@ fullfold ::
((Rgraph sym var)->(sym,[var]))
sym
(Trace sym var pvar)
- -> ([Bool],[Rule sym var],[Rgraph sym var])
+ -> ([Bool],FunBody sym var,[Rgraph sym var])
| == sym
& == var
& == pvar
@@ -114,7 +119,7 @@ recurse ::
((Rgraph sym var)->(sym,[var]))
sym
-> (Trace sym var pvar)
- -> (Bool,([Bool],[Rule sym var],[Rgraph sym var]))
+ -> (Bool,([Bool],FunBody sym var,[Rgraph sym var]))
| == sym
& == var
& == pvar
@@ -154,7 +159,7 @@ foldtips ::
(sym,[var])
-> ([(var,Graph sym var)],[(var,Graph sym var)])
(Trace sym var pvar)
- -> (Bool,([Bool],[Rule sym var],[Rgraph sym var]))
+ -> (Bool,([Bool],FunBody sym var,[Rgraph sym var]))
| == sym
& == var
& == pvar
@@ -223,7 +228,7 @@ newextract ::
(Etracer sym var pvar)
((Rgraph sym var)->(sym,[var]))
(Trace sym var pvar)
- -> ([Bool],[Rule sym var],[Rgraph sym var])
+ -> ([Bool],FunBody sym var,[Rgraph sym var])
| == sym
& == var
& == pvar
diff --git a/sucl/newtest.icl b/sucl/newtest.icl
index 3c311ca..b136595 100644
--- a/sucl/newtest.icl
+++ b/sucl/newtest.icl
@@ -153,7 +153,7 @@ these tuples.
, srr_strictness :: [Bool] // Strictness annotations
, srr_typerule :: Rule tsym tvar // Type rule
, srr_trace :: Trace sym var var // Truncated and folded trace
- , srr_rules :: [Rule sym var] // Resulting rewrite rules
+ , srr_function_body :: FunBody sym var // Resulting rewrite rules
, srr_areas :: [Rgraph sym var] // New areas for further symbolic reduction (not necessarily canonical)
}
@@ -357,7 +357,7 @@ symredarea foldarea cli area
, srr_strictness = stricts
, srr_typerule = trule
, srr_trace = trace
- , srr_rules = rules
+ , srr_function_body = rules
, srr_areas = areas
}
where agraph = rgraphgraph area; aroot = rgraphroot area