diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 17 | ||||
| -rw-r--r-- | src/interp/modemap.boot | 3 | ||||
| -rw-r--r-- | src/interp/wi1.boot | 17 |
4 files changed, 26 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ac7b2bc9..19e0e7cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-08-20 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/compiler.boot (compMacro): Honor $verbose. + * interp/modemap.boot (putDomainsInScope): Likewise. + * interp/wi1.boot (compMacro): Likewise. + 2008-08-19 Gabriel Dos Reis <gdr@cs.tamu.edu> * include/open-axiom.h (oa_buffer_address): New macro. diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index bed900e0..cb9f8110 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1006,14 +1006,15 @@ compVector(l,m is ["Vector",mUnder],e) == compMacro(form,m,e) == $macroIfTrue: local:= true ["MDEF",lhs,signature,specialCases,rhs]:= form - prhs := - rhs is ['CATEGORY,:.] => ['"-- the constructor category"] - rhs is ['Join,:.] => ['"-- the constructor category"] - rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] - rhs is ['add,:.] => ['"-- the constructor capsule"] - formatUnabbreviated rhs - sayBrightly ['" processing macro definition",'%b, - :formatUnabbreviated lhs,'" ==> ",:prhs,'%d] + if $verbose then + prhs := + rhs is ['CATEGORY,:.] => ['"-- the constructor category"] + rhs is ['Join,:.] => ['"-- the constructor category"] + rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] + rhs is ['add,:.] => ['"-- the constructor capsule"] + formatUnabbreviated rhs + sayBrightly ['" processing macro definition",'%b, + :formatUnabbreviated lhs,'" ==> ",:prhs,'%d] m=$EmptyMode or m=$NoValueMode => ["/throwAway",$NoValueMode,put(first lhs,"macro",macroExpand(rhs,e),e)] diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 97f29a33..2eafb6ad 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -363,7 +363,8 @@ getDomainsInScope e == putDomainsInScope(x,e) == l:= getDomainsInScope e - if member(x,l) then SAY("****** Domain: ",x," already in scope") + if $verbose and member(x,l) then + sayBrightly ['" Note: Domain ",x," already in scope"] newValue:= [x,:delete(x,l)] $insideCapsuleFunctionIfTrue => ($CapsuleDomainsInScope:= newValue; e) put("$DomainsInScope","special",newValue,e) diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 798aae6b..7f5592dd 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -499,14 +499,15 @@ compMacro(form,m,e) == ["MDEF",lhs,signature,specialCases,rhs]:= form := markKillAll form firstForm := ["MDEF",first lhs,'(NIL),'(NIL),rhs] markMacro(first lhs,rhs) - rhs := - rhs is ['CATEGORY,:.] => ['"-- the constructor category"] - rhs is ['Join,:.] => ['"-- the constructor category"] - rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] - rhs is ['add,:.] => ['"-- the constructor capsule"] - formatUnabbreviated rhs - sayBrightly ['" processing macro definition",'%b, - :formatUnabbreviated lhs,'" ==> ",:rhs,'%d] + if $verbose then + rhs := + rhs is ['CATEGORY,:.] => ['"-- the constructor category"] + rhs is ['Join,:.] => ['"-- the constructor category"] + rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] + rhs is ['add,:.] => ['"-- the constructor capsule"] + formatUnabbreviated rhs + sayBrightly ['" processing macro definition",'%b, + :formatUnabbreviated lhs,'" ==> ",:rhs,'%d] ["MDEF",lhs,signature,specialCases,rhs]:= form:= macroExpand(form,e) m=$EmptyMode or m=$NoValueMode => ["/throwAway",$NoValueMode,put(first lhs,"macro",rhs,e)] |