k33g · December 14, 2015 16:59 · Mar 28, 2013 · Mar 28, 2013 · Mar 28, 2013 · Mar 28, 2013
diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```
+```javascript
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```ruby
+```
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```coffeescript
+```ruby
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```groovy
+```coffeescript
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```java
+```groovy
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```javascript
+```java
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,4 +1,4 @@
-```python
+```javascript
 module main
 
 import glloq

diff --git a/main.golo.md b/main.golo.md
@@ -1,3 +1,4 @@
+```python
 module main
 
 import glloq
@@ -12,4 +13,5 @@ function main = |args| {
 	combien(): de(): cailloux(): dans(maBoite)
 	combien(): de(): alumettes(): dans(maBoite)
 
-}
+}
+```
diff --git a/main.golo → main.golo.md b/main.golo → main.golo.md
diff --git a/maboite → glloq.golo b/maboite → glloq.golo
@@ -1,4 +1,4 @@
-module golloq
+module glloq
 
 function boite = -> DynamicObject():
 	op(""):

diff --git a/main.golo b/main.golo
@@ -1,5 +1,6 @@
 module main
 
+import glloq
 
 function main = |args| {
 

diff --git a/maboite b/maboite
@@ -1,7 +1,5 @@
 module golloq
 
-
-
 function boite = -> DynamicObject():
 	op(""):
 	value(0):
@@ -71,16 +69,3 @@ function combien = -> DynamicObject():
 		if this: quoi(): equals("cailloux") { println(boite: nbCailloux() + " cailloux") }		
 		return this
 	})		
-
-
-function main = |args| {
-
-	var maBoite = boite(): 
-					ajouter(): trois(): alumettes(): 
-					ajouter(): quatre(): cailloux(): 
-					enlever(): une(): alumette()
-
-	combien(): de(): cailloux(): dans(maBoite)
-	combien(): de(): alumettes(): dans(maBoite)
-
-}
diff --git a/main.golo b/main.golo
@@ -0,0 +1,14 @@
+module main
+
+
+function main = |args| {
+
+  var maBoite = boite(): 
+			ajouter(): trois(): alumettes(): 
+			ajouter(): quatre(): cailloux(): 
+			enlever(): une(): alumette()
+
+	combien(): de(): cailloux(): dans(maBoite)
+	combien(): de(): alumettes(): dans(maBoite)
+
+}
diff --git a/maboite b/maboite
@@ -1,7 +1,86 @@
-var maBoite = boite(): 
-	ajouter(): trois(): alumettes(): 
-	ajouter(): quatre(): cailloux(): 
-	enlever(): une(): alumette()
+module golloq
 
-combien(): de(): cailloux(): dans(maBoite)
-combien(): de(): alumettes(): dans(maBoite)
+
+
+function boite = -> DynamicObject():
+	op(""):
+	value(0):
+	nbCailloux(0):
+	nbAllumettes(0):
+	define("alumette", |this| {
+		if this: op(): equals("+") { this: nbAllumettes(this: nbAllumettes() + this: value())}
+		if this: op(): equals("-") { this: nbAllumettes(this: nbAllumettes() - this: value())}
+		return this
+	}):
+	define("caillou", |this| {
+		if this: op() == "+" { this: nbCailloux(this: nbCailloux() + this: value())}
+		if this: op() == "-" { this: nbCailloux(this: nbCailloux() - this: value())}
+		return this
+	}):	
+	define("alumettes", |this| {
+		return this: alumette()
+
+	}):
+	define("cailloux", |this| {
+		return this: caillou()
+	}):		
+	define("ajouter", |this| {
+		this: op("+")
+		return this
+	}):
+	define("enlever", |this| {
+		this: op("-")
+		return this
+	}):
+	define("une", |this| {
+		this: value(1)
+		return this
+	}):	
+	define("un", |this| {
+		this: value(1)
+		return this
+	}):				
+	define("deux", |this| {
+		this: value(2)
+		return this
+	}):
+	define("trois", |this| {
+		this: value(3)
+		return this
+	}):	
+	define("quatre", |this| {
+		this: value(4)
+		return this
+	})
+
+function combien = -> DynamicObject():
+	quoi(""):
+	define("de", |this| {
+		return this
+	}):
+	define("alumettes", |this| {
+		this: quoi("alumettes")
+		return this
+	}):
+	define("cailloux", |this| {
+		this: quoi("cailloux")
+		return this
+	}):
+	define("dans", |this, boite| {
+		if this: quoi(): equals("alumettes") { println(boite: nbAllumettes() + " alumettes") }
+		if this: quoi(): equals("cailloux") { println(boite: nbCailloux() + " cailloux") }		
+		return this
+	})		
+
+
+function main = |args| {
+
+	var maBoite = boite(): 
+					ajouter(): trois(): alumettes(): 
+					ajouter(): quatre(): cailloux(): 
+					enlever(): une(): alumette()
+
+	combien(): de(): cailloux(): dans(maBoite)
+	combien(): de(): alumettes(): dans(maBoite)
+
+}
diff --git a/gistfile1.py → maboite b/gistfile1.py → maboite
diff --git a/gistfile1.java → gistfile1.py b/gistfile1.java → gistfile1.py
diff --git a/gistfile1.java b/gistfile1.java
@@ -0,0 +1,7 @@
+var maBoite = boite(): 
+	ajouter(): trois(): alumettes(): 
+	ajouter(): quatre(): cailloux(): 
+	enlever(): une(): alumette()
+
+combien(): de(): cailloux(): dans(maBoite)
+combien(): de(): alumettes(): dans(maBoite)
diff --git a/glloq b/glloq
@@ -1,7 +0,0 @@
-  var maBoite = boite(): 
-					ajouter(): trois(): alumettes(): 
-					ajouter(): quatre(): cailloux(): 
-					enlever(): une(): alumette()
-
-	combien(): de(): cailloux(): dans(maBoite)
-	combien(): de(): alumettes(): dans(maBoite)

diff --git a/glloq b/glloq
@@ -0,0 +1,7 @@
+  var maBoite = boite(): 
+					ajouter(): trois(): alumettes(): 
+					ajouter(): quatre(): cailloux(): 
+					enlever(): une(): alumette()
+
+	combien(): de(): cailloux(): dans(maBoite)
+	combien(): de(): alumettes(): dans(maBoite)