diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/category.boot | 8 | ||||
| -rw-r--r-- | src/interp/define.boot | 11 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8246499b..7f311c42 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-13 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/category.boot: Remove dead codes. + * interp/define.boot (hasFullSignature): Tidy. + 2011-07-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/c-util.boot (categoryExports): New. diff --git a/src/interp/category.boot b/src/interp/category.boot index 11abb5c3..9ce65944 100644 --- a/src/interp/category.boot +++ b/src/interp/category.boot @@ -216,7 +216,6 @@ mkOr(a,b) == a=true => true b=true => true b=a => a ---PRETTYPRINT ("Condition merging",a,b) l:= a is ["OR",:a'] => (b is ["OR",:b'] => union(a',b'); mkOr2(b,a') ) @@ -252,7 +251,6 @@ mkAnd(a,b) == a=true => b b=true => a b=a => a - --PRETTYPRINT ("Condition merging",a,b) l:= a is ["AND",:a'] => (b is ["AND",:b'] => union(a',b'); mkAnd2(b,a') ) @@ -360,12 +358,6 @@ CatEval x == $e compMakeCategoryObject(x,e).expr ---RemovePrinAncs(l,leaves) == --- l=nil => nil --- leaves:= [first y for y in leaves] --- --remove the slot pointers --- [x for x in l | not AncestorP(x.0,leaves)] - AncestorP: (%Form, %List %Instantiation) -> %Form AncestorP(xname,leaves) == -- checks for being a principal ancestor of one of the leaves diff --git a/src/interp/define.boot b/src/interp/define.boot index 955d3ea8..50911353 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -586,8 +586,10 @@ compDefineAddSignature([op,:argl],signature,e) == hasFullSignature(argl,[target,:ml],e) == target => - u:= [m or get(x,"mode",e) or return 'failed for x in argl for m in ml] - u~='failed => [target,:u] + u := [m or get(x,"mode",e) or return 'failed for x in argl for m in ml] + u is 'failed => nil + [target,:u] + nil addEmptyCapsuleIfNecessary: (%Form,%Form) -> %Form addEmptyCapsuleIfNecessary(target,rhs) == @@ -1065,8 +1067,7 @@ reportOnFunctorCompilation() == displayWarnings() $functorStats:= addStats($functorStats,$functionStats) [byteCount,elapsedSeconds] := $functorStats - sayBrightly ['%l,:bright '" Cumulative Statistics for Constructor", - $op] + sayBrightly ['%l,:bright '" Cumulative Statistics for Constructor",$op] timeString := normalizeStatAndStringify elapsedSeconds sayBrightly ['" Time:",:bright timeString,'"seconds"] sayBrightly '" " @@ -1852,7 +1853,7 @@ doItIf(item is [.,p,x,y],$predl,$e) == compSingleCapsuleItem(y,[["not",p],:$predl],getInverseEnvironment(p,olde)) y':=localExtras(oldFLP) item.op := '%when - item.rest := [[p',x,:x'],['%otherwise,y,:y']] + item.args := [[p',x,:x'],['%otherwise,y,:y']] where localExtras(oldFLP) == sameObject?(oldFLP,$functorLocalParameters) => nil flp1:=$functorLocalParameters |