diff options
| author | zweije | 2001-07-25 15:51:11 +0000 |
|---|---|---|
| committer | zweije | 2001-07-25 15:51:11 +0000 |
| commit | 4c659b95e68a4742b934993367ecbeee91683d17 (patch) | |
| tree | df995b4728867523cd4e7cb274ff011ae5d5e4ee | |
| parent | This commit was generated by cvs2svn to compensate for changes in r578, (diff) | |
This commit was generated by cvs2svn to compensate for changes in r580,
which included commits to RCS files with non-trunk default branches.
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@581 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
| -rw-r--r-- | sucl/spine.dcl | 20 | ||||
| -rw-r--r-- | sucl/spine.icl | 26 |
2 files changed, 23 insertions, 23 deletions
diff --git a/sucl/spine.dcl b/sucl/spine.dcl index e2b35b0..10da170 100644 --- a/sucl/spine.dcl +++ b/sucl/spine.dcl @@ -157,15 +157,15 @@ in a graph. */ :: Subspine sym var pvar - = Cycle // The spine contains a cycle - | Delta // An imported (delta) rule was found - | Force (Spine sym var pvar) // Global strictness annotation forced evaluation of a subgraph - | MissingCase // All alternatives failed for a function symbol - | Open (Rgraph sym pvar) // Need root normal form of open node for matching - | Partial (Rule sym pvar) (Pfun pvar var) (Spine sym var pvar) // A rule was strictly partially matched - | Unsafe (Rgraph sym var) // Terminated due to immininent recursion - | Redex (Rule sym pvar) (Pfun pvar var) // Total match - | Strict // Need root normal form due to strictness + = Cycle // The spine contains a cycle + | Delta // An imported (delta) rule was found + | Force (Spine sym var pvar) // Global strictness annotation forced evaluation of a subgraph + | MissingCase // All alternatives failed for a function symbol + | Open (Rgraph sym pvar) // Need root normal form of open node for matching + | Partial (Rule sym pvar) (Pfun pvar var) pvar (Spine sym var pvar) // A rule was strictly partially matched + | Unsafe (Rgraph sym var) // Terminated due to immininent recursion + | Redex (Rule sym pvar) (Pfun pvar var) // Total match + | Strict // Need root normal form due to strictness // Fold up a spine using a function for each constructor foldspine @@ -175,7 +175,7 @@ foldspine (.result -> .subresult) .subresult ((Rgraph sym pvar) -> .subresult) - ((Rule sym pvar) (Pfun pvar var) .result -> .subresult) + ((Rule sym pvar) (Pfun pvar var) pvar .result -> .subresult) ((Rgraph sym var) -> .subresult) ((Rule sym pvar) (Pfun pvar var) -> .subresult) .subresult diff --git a/sucl/spine.icl b/sucl/spine.icl index a49f022..0eb3409 100644 --- a/sucl/spine.icl +++ b/sucl/spine.icl @@ -158,15 +158,15 @@ in a graph. */ :: Subspine sym var pvar - = Cycle // The spine contains a cycle - | Delta // An imported (delta) rule was found - | Force (Spine sym var pvar) // Global strictness annotation forced evaluation of a subgraph - | MissingCase // All alternatives failed for a function symbol - | Open (Rgraph sym pvar) // Need root normal form of open node for matching - | Partial (Rule sym pvar) (Pfun pvar var) (Spine sym var pvar) // A rule was strictly partially matched - | Unsafe (Rgraph sym var) // Terminated due to immininent recursion - | Redex (Rule sym pvar) (Pfun pvar var) // Total match - | Strict // Need root normal form due to strictness + = Cycle // The spine contains a cycle + | Delta // An imported (delta) rule was found + | Force (Spine sym var pvar) // Global strictness annotation forced evaluation of a subgraph + | MissingCase // All alternatives failed for a function symbol + | Open (Rgraph sym pvar) // Need root normal form of open node for matching + | Partial (Rule sym pvar) (Pfun pvar var) pvar (Spine sym var pvar) // A rule was strictly partially matched + | Unsafe (Rgraph sym var) // Terminated due to immininent recursion + | Redex (Rule sym pvar) (Pfun pvar var) // Total match + | Strict // Need root normal form due to strictness /* @@ -206,7 +206,7 @@ foldspine (.result -> .subresult) .subresult ((Rgraph sym pvar) -> .subresult) - ((Rule sym pvar) (Pfun pvar var) .result -> .subresult) + ((Rule sym pvar) (Pfun pvar var) pvar .result -> .subresult) ((Rgraph sym var) -> .subresult) ((Rule sym pvar) (Pfun pvar var) -> .subresult) .subresult @@ -223,20 +223,20 @@ foldspine pair cycle delta force missingcase open partial unsafe redex strict sp foldsub (Force spine) = force (fold spine) foldsub MissingCase = missingcase foldsub (Open rgraph) = open rgraph - foldsub (Partial rule matching spine) = partial rule matching (fold spine) + foldsub (Partial rule matching rnode spine) = partial rule matching rnode (fold spine) foldsub (Unsafe rgraph) = unsafe rgraph foldsub (Redex rule matching) = redex rule matching foldsub Strict = strict spinetip :: !(Spine sym var pvar) -> Spine sym var pvar spinetip (_,Force spine) = spinetip spine -spinetip (_,Partial _ _ spine) = spinetip spine +spinetip (_,Partial _ _ pnode spine) = spinetip spine spinetip spine = spine spinenodes :: .(Spine sym var pvar) -> [var] spinenodes spine = foldspine cons [] [] id [] (const []) partial (const []) redex [] spine - where partial _ _ = id + where partial _ _ _ = id redex _ _ = [] ifopen :: result result !.(Answer sym var pvar) -> result |