===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/smacro.sm1,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- OpenXM/src/kan96xx/Kan/smacro.sm1	2000/01/16 07:55:41	1.2
+++ OpenXM/src/kan96xx/Kan/smacro.sm1	2004/09/17 00:47:09	1.8
@@ -1,4 +1,4 @@
-%% $OpenXM$
+%% $OpenXM: OpenXM/src/kan96xx/Kan/smacro.sm1,v 1.7 2004/09/16 23:53:44 takayama Exp $
 %%%%%% global control variables
 %%  /@@@.quiet 0 def  It is defined in scanner().
 /@@@.Dsymbol (D) def
@@ -7,11 +7,16 @@
 /@@@.hsymbol (h) def
 /@@@.esymbol (e_) def
 /@@@.Esymbol (E) def
+/@@@.Hsymbol (H) def
 
 %%% pointer to the StandardContext.
 /StandardContextp [(CurrentContextp)] system_variable def
 /null 0 (null) data_conversion def
 
+/makeInfix {
+  [(or_attr) 4   4 -1 roll ] extension
+} def
+
 %%%%%%%%%%%%%%%%%%%%%%  usages %%%%%%%%%%%%%%%%%%%%
 /@.usages [[( ) [(gate keeper)]] ] def
 /putUsages {  
@@ -64,13 +69,15 @@
      [$PrintDollar$ 0] system_variable pop
      @@@.quiet 0 eq
      {$sm1>$ print} { } ifelse
+     [(traceClearStack)] extension pop
    ] system_variable pop
 } def
 
 /?
 {
    show_systemdictionary
-   (-- ?? : to see macro dictionary --)
+   (-- ?? : to see macro dictionary  --)
+   (--  [(keyword in regular expression)] usages ::    --)
    message
    $-- (keyWord) usage  to see the usages. Data type of (xxxyyy) is string.--$
      message
@@ -93,9 +100,8 @@
    print  newline ;
 } def
 
-/. {expand} def
+/. { expand } def
 
-/, {   } def
 
 /false 0 def
 
@@ -122,13 +128,7 @@
 % v1 v2 join
 /join {
  /arg2 set /arg1 set
- [/v1 /v2] pushVariables
- /v1 arg1 def /v2 arg2 def
- [
-   [v1 aload pop v2 aload pop] /arg1 set
- ] pop
- popVariables
- arg1
+ [(Kjoin) arg1 arg2] extension
 } def
 
 /n.map 0 def  /i.map 0 def /ar.map 0 def /res.map 0 def  %% declare variables