for (var i : o) is now for (var i in o)

vjeux · Apr 26, 2011 · 85959f0 · cpojer · May 3, 2011 · vjeux
1 parent 0709739
commit 85959f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/example/iteration.cpp b/example/iteration.cpp
@@ -1,7 +1,7 @@
 #include "../src/javascript_start.h"
 
 var array = {10, 42, 30};
-for (var i : array) {
+for (var i in array) {
     std::cout << i << " - " << array[i] << std::endl;
 }
 // 0 - 10
@@ -15,7 +15,7 @@ var object = {
     _["b"] = 2,
     _["c"] = 3
 };
-for (var i : object) {
+for (var i in object) {
     std::cout << i << " - " << object[i] << std::endl;
 }
 // a - 1

diff --git a/src/object.h b/src/object.h
@@ -91,7 +91,6 @@ class Object {
 	State* s;
 
 
-
 	std::map<std::string, Object>::iterator begin() {
 		return s->map.begin();
 	}
@@ -100,6 +99,8 @@ class Object {
 		return s->map.end();
 	}
 
+#define in :
+
 protected:
 
 /* Functions */