Index: .poseidon
==================================================================
--- .poseidon
+++ .poseidon
@@ -49,12 +49,10 @@
 			<interface />
 			<resource />
 			<othersDMD />
 			<others>
 				<name>build.bat</name>
-				<name>build.sh</name>
-				<name>builddoc.bat</name>
 				<name>doc\candydoc\modules.ddoc</name>
 				<name>index.dd</name>
 				<name>readme.txt</name>
 			</others>
 		</projectFiles>

ADDED   Makefile
Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -0,0 +1,33 @@
+.PHONY : all windows doc
+
+DC=dmd
+DC_OPT=-O -release
+SRC  = $(wildcard *.d polemy/*.d tricks/*.d) 
+
+
+all:
+	$(DC) $(DC_OPT) -ofbin/polemy $(SRC)
+
+windows:
+	$(DC) $(DC_OPT) -ofbin\\polemy $(SRC)
+
+
+
+
+DOCDIR=doc
+DDOC_FILES=$(DOCDIR)/candydoc/candy.ddoc $(DOCDIR)/candydoc/modules.ddoc
+DDOC_OPT=-o- -D -Dddoc $(DDOC_FILES)
+
+VPATH = . polemy tricks
+
+$(DOCDIR)/%.html: %.d $(DDOC_FILES)
+	$(DC) $(DDOC_OPT) $<
+
+$(DOCDIR)/%.html: %.dd $(DDOC_FILES)
+	$(DC) $(DDOC_OPT) $<
+
+SRCB = $(notdir $(SRC))
+SRCA = $(addprefix $(DOCDIR)/, $(SRCB))
+DOCS = $(SRCA:.d=.html) $(DOCDIR)/index.html
+
+doc: $(DOCS)

DELETED build.sh
Index: build.sh
==================================================================
--- build.sh
+++ build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ ! -d bin ]; then mkdir bin; fi
-echo dmd -ofbin/polemy -O -release main.d polemy/*.d tricks/*.d
-dmd -ofbin/polemy -O -release main.d polemy/*.d tricks/*.d

DELETED builddoc.bat
Index: builddoc.bat
==================================================================
--- builddoc.bat
+++ builddoc.bat
@@ -1,6 +0,0 @@
-@setlocal ENABLEDELAYEDEXPANSION
-@set ARGS=
-@for %%I in (main.d polemy\*.d tricks\*.d) do @set ARGS=!ARGS! %%I
-@if not exist bin mkdir bin
-@echo dmd -o- -D -Dddoc index.dd doc\candydoc\candy.ddoc doc\candydoc\modules.ddoc %ARGS%
-@dmd -o- -D -Dddoc index.dd doc\candydoc\candy.ddoc doc\candydoc\modules.ddoc %ARGS%

Index: doc/_common.html
==================================================================
--- doc/_common.html
+++ doc/_common.html
@@ -24,11 +24,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:45 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/ast.html
==================================================================
--- doc/ast.html
+++ doc/ast.html
@@ -565,11 +565,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:46 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/eval.html
==================================================================
--- doc/eval.html
+++ doc/eval.html
@@ -130,11 +130,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:46 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/failure.html
==================================================================
--- doc/failure.html
+++ doc/failure.html
@@ -180,11 +180,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:47 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/fresh.html
==================================================================
--- doc/fresh.html
+++ doc/fresh.html
@@ -48,11 +48,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:47 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/index.html
==================================================================
--- doc/index.html
+++ doc/index.html
@@ -767,12 +767,14 @@
 <script>explorer.outline.addDecl('外部とのやりとり');</script>
 
 </span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
- <dd> <table>   <tr><th>print</th> <td>(a)</td> <td>a を文字列化標準出力に改行付きで表示</td></tr>
+ <dd> <table>   <tr><th>print</th> <td>(a)</td> <td>a を文字列化標準出力に改行付きで表示して、a を返す</td></tr>
     <tr><th>argv</th> <td></td> <td>スクリプトに渡された引数文字列のconsリスト</td></tr>
+    <tr><th>gensym</th> <td>()</td> <td>エセgensym。変数名として他とかぶらなそうな文字列を返します</td></tr>
+    <tr><th>rand</th> <td>(n)</td> <td>0 以上 n 未満の自然数を31bit以内でランダムに生成します</td></tr>
   </table>
 </dd>
 <br />
 
 
@@ -803,11 +805,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:48 2010
+			on Thu Nov 25 12:30:12 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/layer.html
==================================================================
--- doc/layer.html
+++ doc/layer.html
@@ -152,11 +152,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:13:48 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/lex.html
==================================================================
--- doc/lex.html
+++ doc/lex.html
@@ -309,11 +309,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:05 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/main.html
==================================================================
--- doc/main.html
+++ doc/main.html
@@ -64,11 +64,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:04 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/parse.html
==================================================================
--- doc/parse.html
+++ doc/parse.html
@@ -58,11 +58,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:05 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/repl.html
==================================================================
--- doc/repl.html
+++ doc/repl.html
@@ -158,11 +158,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:06 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/runtime.html
==================================================================
--- doc/runtime.html
+++ doc/runtime.html
@@ -44,11 +44,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:30:12 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/test.html
==================================================================
--- doc/test.html
+++ doc/test.html
@@ -92,11 +92,11 @@
 ;
 </span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
 
-<dd>asserts two operands are <<br><br>
+<dd>asserts two operands are &lt;<br><br>
 
 </dd>
 
 <script>explorer.outline.writeEnabled = true;</script>
 <dt><span class="decl">alias 
@@ -145,11 +145,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:08 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/tricks.html
==================================================================
--- doc/tricks.html
+++ doc/tricks.html
@@ -93,11 +93,12 @@
 
 ()</span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
 
-<dd>Mixing-in the MOST-DERIVED-member-wise comparator for a class<br><br>
+<dd>Mixing-in the MOST-DERIVED-member-wise comparator for a class
+ BE SURE THAT THIS IS CONSISTENT WITH opCmp and opEquals<br><br>
 
 
 <script>explorer.outline.incSymbolLevel();</script>
 <dl>
 <script>explorer.outline.writeEnabled = true;</script>
@@ -119,12 +120,12 @@
 
 </dd>
 
 <script>explorer.outline.writeEnabled = true;</script>
 <dt><span class="decl">template 
-<span class="currsymbol">SimpleCompare</span>
-<script>explorer.outline.addDecl('SimpleCompare');</script>
+<span class="currsymbol">SimpleCompareWithoutToHash</span>
+<script>explorer.outline.addDecl('SimpleCompareWithoutToHash');</script>
 
 ()</span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
 
@@ -136,11 +137,11 @@
 <script>explorer.outline.writeEnabled = true;</script>
 <dt><span class="decl">const bool 
 <span class="currsymbol">opEquals</span>
 <script>explorer.outline.addDecl('opEquals');</script>
 
-(Object <span class="funcparam">rhs_</span>);
+(Object <span class="funcparam">rhs</span>);
 </span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
 
 <dd>member-by-member equality<br><br>
@@ -162,10 +163,23 @@
 </dd>
 </dl>
 <script>explorer.outline.decSymbolLevel();</script>
 
 
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">template 
+<span class="currsymbol">SimpleCompare</span>
+<script>explorer.outline.addDecl('SimpleCompare');</script>
+
+()</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>Mixing-in the MOST-DERIVED-member-wise comparator for a class<br><br>
+
 </dd>
 
 <script>explorer.outline.writeEnabled = true;</script>
 <dt><span class="decl">template 
 <span class="currsymbol">SimpleToString</span>
@@ -223,11 +237,11 @@
 
 (T)</span></dt>
 <script>explorer.outline.writeEnabled = false;</script>
 
 
-<dd>Will be used for dynamic overload resolution pattern<br><br>
+<dd>Utility<br><br>
 
 </dd>
 </dl>
 <script>explorer.outline.decSymbolLevel();</script>
 
@@ -234,11 +248,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:09 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/value.html
==================================================================
--- doc/value.html
+++ doc/value.html
@@ -106,10 +106,75 @@
  But extended with the notion of "Layer"<br><br>
 
 
 <script>explorer.outline.incSymbolLevel();</script>
 <dl>
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">void 
+<span class="currsymbol">set</span>
+<script>explorer.outline.addDecl('set');</script>
+
+(string <span class="funcparam">i</span>, Layer <span class="funcparam">lay</span>, Value <span class="funcparam">v</span>);
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>Set the value <span class="funcparam">v</span> to the index <span class="funcparam">i</span> of layer <span class="funcparam">lay</span><br><br>
+
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">const bool 
+<span class="currsymbol">has</span>
+<script>explorer.outline.addDecl('has');</script>
+
+(string <span class="funcparam">i</span>, Layer <span class="funcparam">lay</span>);
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>True if index <span class="funcparam">i</span> 
+<span class="currsymbol">has</span>
+<script>explorer.outline.addDecl('has');</script>
+
+ value in layer <span class="funcparam">lay</span><br><br>
+
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">Value 
+<span class="currsymbol">get</span>
+<script>explorer.outline.addDecl('get');</script>
+
+(string <span class="funcparam">i</span>, Layer <span class="funcparam">lay</span>, LexPosition <span class="funcparam">pos</span> = null);
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>Return the value of index <span class="funcparam">i</span> at layer <span class="funcparam">lay</span>. Throws if it is not set<br><br>
+
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">T 
+<span class="currsymbol">access</span>
+<script>explorer.outline.addDecl('access');</script>
+
+(T, S...)(Layer <span class="funcparam">lay</span>, string <span class="funcparam">path</span>, S <span class="funcparam">rest</span>);
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>t.
+<span class="currsymbol">access</span>
+<script>explorer.outline.addDecl('access');</script>
+
+!T(lay,a,b,...) returns t.get(a,lay).get(b,lay).... if exists
+ and has type T. Returns <b>null</b> otherwise<br><br>
+
+</dd>
+
 <script>explorer.outline.writeEnabled = true;</script>
 <dt><span class="decl">bool 
 <span class="currsymbol">empty</span>
 <script>explorer.outline.addDecl('empty');</script>
 
@@ -150,10 +215,42 @@
 <script>explorer.outline.writeEnabled = false;</script>
 
 
 <dd>Regard table as a cons-list and convert to an array<br><br>
 
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">Tuple!(string,string,Value)[] 
+<span class="currsymbol">direct_entries</span>
+<script>explorer.outline.addDecl('direct_entries');</script>
+
+();
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>Get the list of direct entries ignoring prototypes in sorted order<br><br>
+
+</dd>
+
+<script>explorer.outline.writeEnabled = true;</script>
+<dt><span class="decl">Tuple!(string,string,Value)[] 
+<span class="currsymbol">entries</span>
+<script>explorer.outline.addDecl('entries');</script>
+
+();
+</span></dt>
+<script>explorer.outline.writeEnabled = false;</script>
+
+
+<dd>Get the whole list of observable 
+<span class="currsymbol">entries</span>
+<script>explorer.outline.addDecl('entries');</script>
+
+ in unspecified order<br><br>
+
 </dd>
 </dl>
 <script>explorer.outline.decSymbolLevel();</script>
 
 
@@ -164,11 +261,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:07 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: doc/valueconv.html
==================================================================
--- doc/valueconv.html
+++ doc/valueconv.html
@@ -86,11 +86,11 @@
 
 </td></tr>
 		<tr><td id="docfooter">
 			Page was generated with
 			<img src="candydoc/img/candydoc.gif" style="vertical-align:middle; position:relative; top:-1px">
-			on Wed Nov 24 21:12:49 2010
+			on Thu Nov 25 12:15:47 2010
 
 		</td></tr>
 	</table>
 </div>
 <script>

Index: index.dd
==================================================================
--- index.dd
+++ index.dd
@@ -599,11 +599,11 @@
 </p>
 ))
 
 $(SECTION 外部とのやりとり, $(SECBODY
   $(TABLE
-    $(TR $(TH print) $(TD (a)) $(TD a を文字列化標準出力に改行付きで表示))
+    $(TR $(TH print) $(TD (a)) $(TD a を文字列化標準出力に改行付きで表示して、a を返す))
     $(TR $(TH argv) $(TD ) $(TD スクリプトに渡された引数文字列のconsリスト))
     $(TR $(TH gensym) $(TD ()) $(TD エセgensym。変数名として他とかぶらなそうな文字列を返します))
     $(TR $(TH rand) $(TD (n)) $(TD 0 以上 n 未満の自然数を31bit以内でランダムに生成します))
   )
 ))

Index: polemy/runtime.d
==================================================================
--- polemy/runtime.d
+++ polemy/runtime.d
@@ -80,12 +80,12 @@
 	});
 	e.addPrimitive("{}", ValueLayer, (){
 		return new Table;
 	});
 	// IO and others
-	e.addPrimitive("print", ValueLayer, (Value a){ writeln(a); return new IntValue(0); });
+	e.addPrimitive("print", ValueLayer, (Value a){ writeln(a); return a; });
 	e.addPrimitive("gensym", ValueLayer, (){ return new StrValue(freshVarName()); });
 	auto rand = Mt19937(unpredictableSeed);
 	e.addPrimitive("rand", ValueLayer, (IntValue n){
 		return new IntValue( uniform(0,cast(int)n.data.toInt(),rand) );
 	});
 }

Index: readme.txt
==================================================================
--- readme.txt
+++ readme.txt
@@ -1,21 +1,22 @@
 -----------------------------------------------------------------------------
   Polemy 0.1.0
                                                  by k.inaba (www.kmonos.net)
-                                                               Nov 24, 2010
+                                                               Nov 25, 2010
 -----------------------------------------------------------------------------
 
 [How to Build]
 
   - Install DMD
       http://www.digitalmars.com/d/2.0/changelog.html
     Version 2.050 is recommended. Older or newer version may not work.
 
   - Build
-      (for Windows) Run build.bat
-      (for Unix) Run sh build.sh
-      or use your favorite build tools upon main.d and polemy/*.d.
+      Run
+        (on Windows) build.bat
+        (on Unix)    make
+      or use your favorite build tools upon "main.d polemy/*.d tricks/*.d".
 
   Then you will get the executable "polemy" in the "bin" directory.
 
 
 

DELETED sample/ast.pmy
Index: sample/ast.pmy
==================================================================
--- sample/ast.pmy
+++ sample/ast.pmy
@@ -1,28 +0,0 @@
-def reverse(lst, acc)
-{
-	case(lst)
-		when {car:a, cdr: d}:  reverse(d, {car:a, cdr:acc})
-		when {}:   acc
-};
-
-@macro reverseArgs(e) {@value(
-	var ev = @macro(e);
-	case(ev)
-		when {is:"App", fun:f, args:a}:
-		(
-			ev {args: reverse(a, {})}
-#			{is:"App", fun:f, args:reverse(a, {})}
-		)
-		when _ :
-		(
-			ev
-		)
-)};
-
-def main()
-{
-	print( reverseArgs(1 + 2) );
-	print( reverseArgs(1 - 2) );
-};
-
-main()

Index: sample/macro.pmy
==================================================================
--- sample/macro.pmy
+++ sample/macro.pmy
@@ -1,76 +1,131 @@
-@macro twice = fun(x) { x; x };
-@macro max(x,y) {
-  var _x = x; # no hygenic macro btw....
-  var _y = y; # no hygenic macro btw....
-  if(_x<_y)then _y else _x
-};
-def maxNormal(x,y) {
-  if(x<y)
-	then: y
-	else: x
-};
+########################################
+print("----------");
+
+@macro twice = fun(x) { x; x }; # Hello Hello
+twice( print("Hello") );
+
+########################################
+print("----------");
+
 @macro maxBad(x,y) {
-  if x<y: y else: x
+	if x<y then y else x
+};
+@macro maxGood(x,y) {
+	var _x = x;  # NOTE: no hygenic macro
+	var _y = y;
+	if _x < _y then _y else _x
 };
-
-@macro LetItBe(x, y) { let it = x in y };
-
-@macro pow10(x) {
-  @value(
-    def pow(y, n) {
-      if( n == 1 ) then y
-      else
-        @macro( @value(y) * @value(pow(y,n-1)) )
-    }
-    in
-      pow(@macro(x+1),10)
-  )
+def maxFun(x,y) {
+	if x<y then y else x
 };
+@macro maxGreat(x,y){@value(
+	var nx = gensym(); # generate fresh symbol
+	var ny = gensym();
+	@macro _x = @macro(nx) {name: nx};  # cheating to create {is:"Var" .. }
+	@macro _y = @macro(ny) {name: ny};  # at macro layer
+	{is: "Let", name: nx, layer: "", init: @macro(x), expr:
+		{is: "Let", name: ny, layer: "", init: @macro(y), expr:
+			@macro(if _x < _y then _y else _x)}} # the expression
+)};
 
-@macro pow10Hard(x) {
-  @value(
-    def pow(x, n) {
-      if( n == 1 ) then x 
-      else
-        @macro( @value(x) * @value(pow(x,n-1)) )
-    }
-    in
-      pow(@macro(x+1),10)
-  )
+print( maxGood(print(1), print(2)) );  # 1 2 2
+print( maxBad(print(1), print(2)) );    # 1 2 2 2
+print( maxFun(print(1), print(2)) );    # 1 2 2
+print( maxGreat(print(1), print(2)) );    # 1 2 2
+print( maxGreat(print(2), print(1)) );    # 2 1 2
+
+########################################
+print("----------");
+
+# the variable "it" is inserted to the scope
+@macro LetItBe(x, y) { let it = x in y };
+print( LetItBe("myself",  "when I find " ~ it ~ " in times of trouble") );
+
+########################################
+print("----------");
+
+# layerd parameter can also be used for @macro
+# you can mix @macro and normal parameters!!
+def 3way(n, c1 @macro, c2 @macro, c3 @macro)
+{
+	case n*n
+		when 0: c1
+		when 1: c2
+		when 4: c3
 };
 
-def printAndReturn(x)
-{
-	print(x);
-	x
-};
+3way( rand(3), print("One"), print("Two"), print("Three") );
+3way( rand(3), print("One"), print("Two"), print("Three") );
+3way( rand(3), print("One"), print("Two"), print("Three") );
+
+########################################
+print("----------");
+
+# Conversely, we can mix @value parameter in the macro definition
+@macro times(n @value, e) { @value(
+	if n == 1 then
+		@macro(e)
+	else
+		@macro(e; times(n-1,e))
+)};
+times(7, print("Ichimen no Nanohana"));
+
+# Here, n is bound to the integer 7, not the AST of it.
+
+########################################
+print("----------");
+
+# Explicit manipulation of AST.
+# Reverse the order of arguments of the function call expression
+@macro reverseArgs(e) {@value(
+	def rev(xs, acc) {
+		case xs when {car:x, cdr:xs}: rev(xs, {car:x, cdr:acc}) when {}: acc
+	};
+	case @macro(e)
+		when {is:"App", fun:f, args:as}: {is:"App", fun:f, args:rev(as,{})}
+		when e : e
+)};
+print( reverseArgs(1+2) ); # 2+1 == 3
+print( reverseArgs(1-2) ); # 2-1 == 1
+
+########################################
+print("----------");
+
+# Both prints "original". Macro respects the neutral layer's "let y="
+# and "fun(y)". It does not alter the inner scope y
+@macro test1(y) { fun(y){y}("original") };
+@macro test2(y) { let y = "original" in y };
+print( test1("replaced?") );
+print( test2("replaced?") );
+
+########################################
+print("----------");
+
+# Macro expansion is done only at the first call.
+# So by using @macro parameter, it can remember the argument
+# of the first call.
+def remember1( x @macro, y ) { if x == y then "yes" else "no" };
+print( remember1(1, 1) );  # yes  1 == 1
+print( remember1(2,1) ); # yes  "1" == 1
+print( remember1(2,2) ); # no  "1"  != 2
+
+# exactly the same function, but called in different order
+def remember2( x @macro, y ) { if x == y then "yes" else "no" };
+print( remember2(2, 2) );  # yes  "2" == 2
+print( remember2(2, 1) ); # no   "2" != 1
+print( remember2(1, 1)  ); # no  "2" != 1
+
+# Is this a good thing or a bad thing??
 
-def main()
-{
-	twice( print("foo") );
-	print("--------------");
-	print(max(printAndReturn(100),printAndReturn(200)));
-	print("--------------");
-	print(maxNormal(printAndReturn(100),printAndReturn(200)));
-	print("--------------");
-	print(maxBad(printAndReturn(100),printAndReturn(200)));
-	print("--------------");
-	print( LetItBe( 1+2+3, it*it ) );
-	print("--------------");
-	print(pow10(1));
-	print(pow10(2));
-	print("--------------");
-	print(pow10Hard(1));
-	print(pow10Hard(2));
-};
+########################################
+print("----------");
 
-main();
+# Trick to extract the AST of a function
+def foo(x) { x + x };
+print( @macro(@value(foo)(arg1)) );   # prints AST for "arg1 + arg1"
 
-@macro foo(y)
-{
-	fun(y){y}(300)
-#	let y = 300 in y
-};
-
-print("--------------");
-print(foo(200));
+# If we wrote @macro(foo(arg1)), it is the AST of "foo(arg1)"
+# Here, by @value(foo) we obtain the "usual" behavior of foo,
+# not the macro-like bahavior to construct AST "foo(??)".
+# But still, by @macro( ... ) layer, the "usual" function is run in
+# macro mode.