[open-axiom-commit] SF.net SVN: open-axiom:[736] trunk/src/interp
A system for computer algebra and symbolic mathematics
Brought to you by:
dos-reis
Menu
▾
▴
[open-axiom-commit] SF.net SVN: open-axiom:[736] trunk/src/interp
|
From: <dos...@us...> - 2008-08-20 22:07:50
|
Revision: 736
http://open-axiom.svn.sourceforge.net/open-axiom/?rev=736&view=rev
Author: dos-reis
Date: 2008-08-20 22:07:57 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
* interp/compiler.boot (compMacro): Honor $verbose.
* interp/modemap.boot (putDomainsInScope): Likewise.
* interp/wi1.boot (compMacro): Likewise.
Modified Paths:
--------------
1.2/src/ChangeLog
1.2/src/interp/compiler.boot
1.2/src/interp/modemap.boot
1.2/src/interp/server.boot
1.2/src/interp/wi1.boot
trunk/src/ChangeLog
trunk/src/interp/compiler.boot
trunk/src/interp/modemap.boot
trunk/src/interp/wi1.boot
Modified: 1.2/src/ChangeLog
===================================================================
--- 1.2/src/ChangeLog 2008-08-20 05:06:59 UTC (rev 735)
+++ 1.2/src/ChangeLog 2008-08-20 22:07:57 UTC (rev 736)
@@ -1,3 +1,9 @@
+2008-08-20 Gabriel Dos Reis <gd...@cs...>
+
+ * interp/compiler.boot (compMacro): Honor $verbose.
+ * interp/modemap.boot (putDomainsInScope): Likewise.
+ * interp/wi1.boot (compMacro): Likewise.
+
2008-08-19 Gabriel Dos Reis <gd...@cs...>
* lisp/core.lisp.in (|$useDynamicLink|)[ECL]: Test for :DFFI feature.
Modified: 1.2/src/interp/compiler.boot
===================================================================
--- 1.2/src/interp/compiler.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ 1.2/src/interp/compiler.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -1006,14 +1006,15 @@
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)]
Modified: 1.2/src/interp/modemap.boot
===================================================================
--- 1.2/src/interp/modemap.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ 1.2/src/interp/modemap.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -363,7 +363,8 @@
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)
Modified: 1.2/src/interp/server.boot
===================================================================
--- 1.2/src/interp/server.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ 1.2/src/interp/server.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -45,6 +45,7 @@
$EndServerSession := false
$NeedToSignalSessionManager := false
$sockBufferLength := 9217
+$Prompt := false
serverReadLine(stream) ==
-- used in place of READ-LINE in a scratchpad server system.
Modified: 1.2/src/interp/wi1.boot
===================================================================
--- 1.2/src/interp/wi1.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ 1.2/src/interp/wi1.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -499,14 +499,15 @@
["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)]
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-08-20 05:06:59 UTC (rev 735)
+++ trunk/src/ChangeLog 2008-08-20 22:07:57 UTC (rev 736)
@@ -1,3 +1,9 @@
+2008-08-20 Gabriel Dos Reis <gd...@cs...>
+
+ * interp/compiler.boot (compMacro): Honor $verbose.
+ * interp/modemap.boot (putDomainsInScope): Likewise.
+ * interp/wi1.boot (compMacro): Likewise.
+
2008-08-19 Gabriel Dos Reis <gd...@cs...>
* include/open-axiom.h (oa_buffer_address): New macro.
Modified: trunk/src/interp/compiler.boot
===================================================================
--- trunk/src/interp/compiler.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ trunk/src/interp/compiler.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -1006,14 +1006,15 @@
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)]
Modified: trunk/src/interp/modemap.boot
===================================================================
--- trunk/src/interp/modemap.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ trunk/src/interp/modemap.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -363,7 +363,8 @@
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)
Modified: trunk/src/interp/wi1.boot
===================================================================
--- trunk/src/interp/wi1.boot 2008-08-20 05:06:59 UTC (rev 735)
+++ trunk/src/interp/wi1.boot 2008-08-20 22:07:57 UTC (rev 736)
@@ -499,14 +499,15 @@
["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)]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|