remove conflict markers

Summary:
If I try to split these into non-strings, I get a commit hook error.

To get rid of them I did this:

  %s/=======*/------------------------/g
Esse commit está contido em:
ptarjan
2013-04-11 09:47:01 -07:00
commit de Sara Golemon
commit 568f06d05d
+110 -110
Ver Arquivo
@@ -1213,7 +1213,7 @@ bool TestCodeRun::TestExceptions() {
"}\n"
"$obj = new C;\n"
"$obj->f();\n"
"echo \"==========\\n\";\n"
"echo \"------------------------\\n\";\n"
"Exception::setTraceOptions(true);\n"
"$obj->f();\n"
,
@@ -1237,7 +1237,7 @@ bool TestCodeRun::TestExceptions() {
" string(2) \"->\"\n"
" }\n"
"}\n"
"==========\n"
"------------------------\n"
"array(2) {\n"
" [0]=>\n"
" array(4) {\n"
@@ -8526,7 +8526,7 @@ bool TestCodeRun::TestCollectionClasses() {
" var_dump(empty($vec[$k]));\n"
" echo \"\\n\";\n"
"}\n"
"echo \"=====================\\n\\n\";\n"
"echo \"------------------------\\n\\n\";\n"
"$mp = Map::fromArray($arr);\n"
"foreach ($arr as $k => $v) {\n"
" var_dump($mp[$k]);\n"
@@ -8540,7 +8540,7 @@ bool TestCodeRun::TestCollectionClasses() {
"}\n"
"ksort($new_arr);\n"
"var_dump($new_arr);\n"
"echo \"=====================\\n\\n\";\n"
"echo \"------------------------\\n\\n\";\n"
"$smp = StableMap::fromArray($arr);\n"
"foreach ($smp as $k => $v) {\n"
" var_dump($v);\n"
@@ -8651,7 +8651,7 @@ bool TestCodeRun::TestCollectionClasses() {
"bool(false)\n"
"bool(false)\n"
"\n"
"=====================\n"
"------------------------\n"
"\n"
"NULL\n"
"bool(false)\n"
@@ -8739,7 +8739,7 @@ bool TestCodeRun::TestCollectionClasses() {
" [13]=>\n"
" string(3) \"foo\"\n"
"}\n"
"=====================\n"
"------------------------\n"
"\n"
"NULL\n"
"NULL\n"
@@ -8935,7 +8935,7 @@ bool TestCodeRun::TestCollectionClasses() {
"$v[] = 'foo';\n"
"var_dump(serialize($v));\n"
"$v2 = unserialize(serialize($v));\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"var_dump($v);\n"
"print_r($v);\n"
"echo json_encode($v) . \"\\n\";\n"
@@ -8946,7 +8946,7 @@ bool TestCodeRun::TestCollectionClasses() {
"var_export($v2); echo \"\\n\";\n"
,
"string(31) \"V:6:\"Vector\":2:{i:7;s:3:\"foo\";}\"\n"
"=========================\n"
"------------------------\n"
"object(Vector)#1 (2) {\n"
" [0]=>\n"
" int(7)\n"
@@ -8986,7 +8986,7 @@ bool TestCodeRun::TestCollectionClasses() {
"$m[3] = 'foo';\n"
"var_dump(serialize($m));\n"
"$m2 = unserialize(serialize($m));\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"var_dump($m);\n"
"print_r($m);\n"
"echo json_encode($m) . \"\\n\";\n"
@@ -8995,12 +8995,12 @@ bool TestCodeRun::TestCollectionClasses() {
"print_r($m2);\n"
"echo json_encode($m2) . \"\\n\";\n"
"var_export($m2); echo \"\\n\";\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = new Map;\n"
"$m['bar'] = 7;\n"
"var_dump(serialize($m));\n"
"$m2 = unserialize(serialize($m));\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"var_dump($m);\n"
"print_r($m);\n"
"echo json_encode($m) . \"\\n\";\n"
@@ -9011,7 +9011,7 @@ bool TestCodeRun::TestCollectionClasses() {
"var_export($m2); echo \"\\n\";\n"
,
"string(28) \"K:3:\"Map\":1:{i:3;s:3:\"foo\";}\"\n"
"=========================\n"
"------------------------\n"
"object(Map)#1 (1) {\n"
" [3]=>\n"
" string(3) \"foo\"\n"
@@ -9036,9 +9036,9 @@ bool TestCodeRun::TestCollectionClasses() {
"Map::__set_state(array(\n"
" 3 => 'foo',\n"
"))\n"
"=========================\n"
"------------------------\n"
"string(28) \"K:3:\"Map\":1:{s:3:\"bar\";i:7;}\"\n"
"=========================\n"
"------------------------\n"
"object(Map)#3 (1) {\n"
" [\"bar\"]=>\n"
" int(7)\n"
@@ -9071,7 +9071,7 @@ bool TestCodeRun::TestCollectionClasses() {
"$m['bar'] = 7;\n"
"var_dump(serialize($m));\n"
"$m2 = unserialize(serialize($m));\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"var_dump($m);\n"
"print_r($m);\n"
"echo json_encode($m) . \"\\n\";\n"
@@ -9080,13 +9080,13 @@ bool TestCodeRun::TestCollectionClasses() {
"print_r($m2);\n"
"echo json_encode($m2) . \"\\n\";\n"
"var_export($m2); echo \"\\n\";\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = new StableMap;\n"
"$m['bar'] = 7;\n"
"$m[3] = 'foo';\n"
"var_dump(serialize($m));\n"
"$m2 = unserialize(serialize($m));\n"
"echo \"=========================\\n\";\n"
"echo \"------------------------\\n\";\n"
"var_dump($m);\n"
"print_r($m);\n"
"echo json_encode($m) . \"\\n\";\n"
@@ -9098,7 +9098,7 @@ bool TestCodeRun::TestCollectionClasses() {
,
"string(48) \"K:9:\"StableMap\":2:{i:3;s:3:\"foo\";s:3:\"bar\";"
"i:7;}\"\n"
"=========================\n"
"------------------------\n"
"object(StableMap)#1 (2) {\n"
" [3]=>\n"
" string(3) \"foo\"\n"
@@ -9131,10 +9131,10 @@ bool TestCodeRun::TestCollectionClasses() {
" 3 => 'foo',\n"
" 'bar' => 7,\n"
"))\n"
"=========================\n"
"------------------------\n"
"string(48) \"K:9:\"StableMap\":2:{s:3:\"bar\";i:7;i:3;"
"s:3:\"foo\";}\"\n"
"=========================\n"
"------------------------\n"
"object(StableMap)#3 (2) {\n"
" [\"bar\"]=>\n"
" int(7)\n"
@@ -9251,7 +9251,7 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($v as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
"}\n"
"echo \"=======\\n\";\n"
"echo \"------------------------\\n\";\n"
"$s = new StableMap;\n"
"$s['w'] = 2;\n"
"$s['v'] = 4;\n"
@@ -9262,7 +9262,7 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($s as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
"}\n"
"echo \"=======\\n\";\n"
"echo \"------------------------\\n\";\n"
"asort($s);\n"
"foreach ($s as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
@@ -9271,13 +9271,13 @@ bool TestCodeRun::TestCollectionClasses() {
"0 a\n"
"1 b\n"
"2 c\n"
"=======\n"
"------------------------\n"
"v 4\n"
"w 2\n"
"x 5\n"
"y 3\n"
"z 1\n"
"=======\n"
"------------------------\n"
"z 1\n"
"w 2\n"
"y 3\n"
@@ -9299,7 +9299,7 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($v as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
"}\n"
"echo \"=======\\n\";\n"
"echo \"------------------------\\n\";\n"
"$s = new StableMap;\n"
"$s['w'] = 2;\n"
"$s['v'] = 4;\n"
@@ -9310,7 +9310,7 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($s as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
"}\n"
"echo \"=======\\n\";\n"
"echo \"------------------------\\n\";\n"
"uasort($s, 'cmp');\n"
"foreach ($s as $key => $val) {\n"
" echo $key . ' ' . $val . \"\\n\";\n"
@@ -9319,13 +9319,13 @@ bool TestCodeRun::TestCollectionClasses() {
"0 c\n"
"1 b\n"
"2 a\n"
"=======\n"
"------------------------\n"
"z 1\n"
"y 3\n"
"x 5\n"
"w 2\n"
"v 4\n"
"=======\n"
"------------------------\n"
"x 5\n"
"v 4\n"
"y 3\n"
@@ -9535,14 +9535,14 @@ bool TestCodeRun::TestCollectionClasses() {
"var_dump($v1 == $v2);\n"
"$v2[] = 74;\n"
"var_dump($v1 == $v2);\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$v = Vector {};\n"
"var_dump($v == null);\n"
"var_dump($v == false);\n"
"var_dump($v == true);\n"
"var_dump($v == 1);\n"
"var_dump($v == \"Vector\");\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$v = Vector {7};\n"
"var_dump($v == null);\n"
"var_dump($v == false);\n"
@@ -9555,13 +9555,13 @@ bool TestCodeRun::TestCollectionClasses() {
"bool(true)\n"
"bool(false)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
"bool(false)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
@@ -9580,7 +9580,7 @@ bool TestCodeRun::TestCollectionClasses() {
"var_dump($m1 == $m2);\n"
"$m1['c'] = 0;\n"
"var_dump($m1 == $m2);\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m1 = Map {'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4};\n"
"$m1->remove('a');\n"
"$m1->remove('c');\n"
@@ -9594,14 +9594,14 @@ bool TestCodeRun::TestCollectionClasses() {
"var_dump($m1 == $m2);\n"
"$m2['d'] = 4;\n"
"var_dump($m1 == $m2);\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = Map {};\n"
"var_dump($m == null);\n"
"var_dump($m == false);\n"
"var_dump($m == true);\n"
"var_dump($m == 1);\n"
"var_dump($m == \"Map\");\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = Map {'x' => 7};\n"
"var_dump($m == null);\n"
"var_dump($m == false);\n"
@@ -9612,19 +9612,19 @@ bool TestCodeRun::TestCollectionClasses() {
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(true)\n"
"bool(false)\n"
"bool(true)\n"
"bool(false)\n"
"bool(true)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
"bool(false)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
@@ -9643,14 +9643,14 @@ bool TestCodeRun::TestCollectionClasses() {
"var_dump($s1 == $s2);\n"
"$s1['b'] = 3;\n"
"var_dump($s1 == $s2);\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = StableMap {};\n"
"var_dump($m == null);\n"
"var_dump($m == false);\n"
"var_dump($m == true);\n"
"var_dump($m == 1);\n"
"var_dump($m == \"StableMap\");\n"
"echo \"============\\n\";\n"
"echo \"------------------------\\n\";\n"
"$m = StableMap {'x' => 7};\n"
"var_dump($m == null);\n"
"var_dump($m == false);\n"
@@ -9662,13 +9662,13 @@ bool TestCodeRun::TestCollectionClasses() {
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
"bool(false)\n"
"bool(false)\n"
"============\n"
"------------------------\n"
"bool(false)\n"
"bool(false)\n"
"bool(true)\n"
@@ -9780,33 +9780,33 @@ bool TestCodeRun::TestCollectionClasses() {
" var_dump(count($t));\n"
" var_dump($t->count());\n"
" var_dump($t->isEmpty());\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" foreach ($t as $k => $v) {\n"
" var_dump($k, $v);\n"
" }\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump($t[0], $t[1]);\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump($t->at(0), $t->at(1));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump($t->get(0), $t->get(1), $t->get(2));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump((array)$t);\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump(serialize($t));\n"
" var_dump(unserialize(serialize($t)));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump($t->count());\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump($t->getIterator() instanceof Iterator);\n"
" var_dump($t->getIterator() instanceof KeyedIterator);\n"
" foreach ($t->getIterator() as $k => $v) {\n"
" var_dump($k, $v);\n"
" }\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump((array)$t);\n"
" var_dump($t->toArray());\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" var_dump(clone $t);\n"
"}\n"
"f();\n"
@@ -9814,29 +9814,29 @@ bool TestCodeRun::TestCollectionClasses() {
"int(2)\n"
"int(2)\n"
"bool(false)\n"
"==========\n"
"------------------------\n"
"int(0)\n"
"string(3) \"foo\"\n"
"int(1)\n"
"int(42)\n"
"==========\n"
"------------------------\n"
"string(3) \"foo\"\n"
"int(42)\n"
"==========\n"
"------------------------\n"
"string(3) \"foo\"\n"
"int(42)\n"
"==========\n"
"------------------------\n"
"string(3) \"foo\"\n"
"int(42)\n"
"NULL\n"
"==========\n"
"------------------------\n"
"array(2) {\n"
" [0]=>\n"
" string(3) \"foo\"\n"
" [1]=>\n"
" int(42)\n"
"}\n"
"==========\n"
"------------------------\n"
"string(30) \"V:4:\"Pair\":2:{s:3:\"foo\";i:42;}\"\n"
"object(Pair)#5 (2) {\n"
" [0]=>\n"
@@ -9844,16 +9844,16 @@ bool TestCodeRun::TestCollectionClasses() {
" [1]=>\n"
" int(42)\n"
"}\n"
"==========\n"
"------------------------\n"
"int(2)\n"
"==========\n"
"------------------------\n"
"bool(true)\n"
"bool(true)\n"
"int(0)\n"
"string(3) \"foo\"\n"
"int(1)\n"
"int(42)\n"
"==========\n"
"------------------------\n"
"array(2) {\n"
" [0]=>\n"
" string(3) \"foo\"\n"
@@ -9866,7 +9866,7 @@ bool TestCodeRun::TestCollectionClasses() {
" [1]=>\n"
" int(42)\n"
"}\n"
"==========\n"
"------------------------\n"
"object(Pair)#5 (2) {\n"
" [0]=>\n"
" string(3) \"foo\"\n"
@@ -9913,12 +9913,12 @@ bool TestCodeRun::TestCollectionClasses() {
" var_dump($t[0], $t[1]);\n"
"}\n"
"var_dump(new Vector($mp1->items()));\n"
"echo \"==========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$vec2 = Vector::fromItems($mp1->items());\n"
"var_dump($vec2);\n"
"$mp2 = StableMap::fromItems($mp1->items());\n"
"var_dump($mp2);\n"
"echo \"==========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$tuples = Vector {Pair {'a', 1}, Pair {2, 'b'}, Pair {'z', 9}};\n"
"$mp3 = StableMap::fromItems($tuples);\n"
"var_dump($mp3);\n"
@@ -9955,7 +9955,7 @@ bool TestCodeRun::TestCollectionClasses() {
" int(9)\n"
" }\n"
"}\n"
"==========\n"
"------------------------\n"
"object(Vector)#19 (3) {\n"
" [0]=>\n"
" object(Pair)#20 (2) {\n"
@@ -9987,7 +9987,7 @@ bool TestCodeRun::TestCollectionClasses() {
" [\"z\"]=>\n"
" int(9)\n"
"}\n"
"==========\n"
"------------------------\n"
"object(StableMap)#31 (3) {\n"
" [\"a\"]=>\n"
" int(1)\n"
@@ -10004,17 +10004,17 @@ bool TestCodeRun::TestCollectionClasses() {
" var_dump($vec->containsKey(0));\n"
" var_dump($vec->containsKey(1));\n"
" var_dump($vec->containsKey(2));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" $mp = Map {'a' => 1, 2 => 'b'};\n"
" var_dump($mp->containsKey('a'));\n"
" var_dump($mp->containsKey(2));\n"
" var_dump($mp->containsKey('b'));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" $smp = StableMap {'a' => 1, 2 => 'b'};\n"
" var_dump($smp->containsKey('a'));\n"
" var_dump($smp->containsKey(2));\n"
" var_dump($smp->containsKey('b'));\n"
" echo \"==========\\n\";\n"
" echo \"------------------------\\n\";\n"
" $pair = Pair {1, 'b'};\n"
" var_dump($pair->containsKey(0));\n"
" var_dump($pair->containsKey(1));\n"
@@ -10025,15 +10025,15 @@ bool TestCodeRun::TestCollectionClasses() {
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
"==========\n"
"------------------------\n"
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
"==========\n"
"------------------------\n"
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
"==========\n"
"------------------------\n"
"bool(true)\n"
"bool(true)\n"
"bool(false)\n"
@@ -10113,17 +10113,17 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mp = Map {'a' => 0, 'b' => 3, 'c' => 6};\n"
"foreach ($mp->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9};\n"
"foreach ($smp->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$pair = Pair {0, 3};\n"
"foreach ($pair->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
@@ -10133,15 +10133,15 @@ bool TestCodeRun::TestCollectionClasses() {
"int(4)\n"
"int(1)\n"
"int(10)\n"
"========\n"
"------------------------\n"
"string(1) \"b\"\n"
"int(4)\n"
"========\n"
"------------------------\n"
"string(1) \"b\"\n"
"int(4)\n"
"string(1) \"d\"\n"
"int(10)\n"
"========\n"
"------------------------\n"
"int(0)\n"
"int(4)\n"
);
@@ -10153,17 +10153,17 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->view()->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mp = Map {'a' => 0, 'b' => 3, 'c' => 6};\n"
"foreach ($mp->view()->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9};\n"
"foreach ($smp->view()->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$pair = Pair {0, 3};\n"
"foreach ($pair->view()->map($mapFn)->filter($filtFn) as $k => $v) {\n"
" var_dump($k, $v);\n"
@@ -10173,15 +10173,15 @@ bool TestCodeRun::TestCollectionClasses() {
"int(4)\n"
"int(3)\n"
"int(10)\n"
"========\n"
"------------------------\n"
"string(1) \"b\"\n"
"int(4)\n"
"========\n"
"------------------------\n"
"string(1) \"b\"\n"
"int(4)\n"
"string(1) \"d\"\n"
"int(10)\n"
"========\n"
"------------------------\n"
"int(1)\n"
"int(4)\n"
);
@@ -10192,17 +10192,17 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->kvzip()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mp = Map {2 => 'a'};\n"
"foreach ($mp->kvzip()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'};\n"
"foreach ($smp->kvzip()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$pair = Pair {'a', 'b'};\n"
"foreach ($pair->kvzip()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
@@ -10216,10 +10216,10 @@ bool TestCodeRun::TestCollectionClasses() {
"string(1) \"c\"\n"
"int(10)\n"
"string(1) \"d\"\n"
"========\n"
"------------------------\n"
"int(7)\n"
"string(1) \"a\"\n"
"========\n"
"------------------------\n"
"int(7)\n"
"string(1) \"a\"\n"
"int(13)\n"
@@ -10228,7 +10228,7 @@ bool TestCodeRun::TestCollectionClasses() {
"string(1) \"c\"\n"
"int(25)\n"
"string(1) \"d\"\n"
"========\n"
"------------------------\n"
"int(1)\n"
"string(1) \"a\"\n"
"int(4)\n"
@@ -10241,13 +10241,13 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->items()->map($mapFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mapFn = function ($t) { return Pair {$t[0]*3+1, $t[1]}; };\n"
"$mp = Map {2 => 'a'};\n"
"foreach ($mp->items()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'};\n"
"foreach ($smp->items()->map($mapFn) as $t) {\n"
" var_dump($t[0], $t[1]);\n"
@@ -10257,10 +10257,10 @@ bool TestCodeRun::TestCollectionClasses() {
"int(13)\n"
"int(19)\n"
"int(25)\n"
"========\n"
"------------------------\n"
"int(7)\n"
"string(1) \"a\"\n"
"========\n"
"------------------------\n"
"int(7)\n"
"string(1) \"a\"\n"
"int(13)\n"
@@ -10278,17 +10278,17 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mp = Map {0 => 'a', 3 => 'b', 6 => 'c'};\n"
"foreach ($mp->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'};\n"
"foreach ($smp->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$v = Vector {0, 1, 2, 3, 4};\n"
"$iterable = $v->map(function ($x) { return $x+1; })\n"
" ->filter(function ($x) { return $x % 2 == 0; });\n"
@@ -10300,12 +10300,12 @@ bool TestCodeRun::TestCollectionClasses() {
,
"int(2)\n"
"int(4)\n"
"========\n"
"------------------------\n"
"int(4)\n"
"========\n"
"------------------------\n"
"int(4)\n"
"int(10)\n"
"========\n"
"------------------------\n"
"2 2\n"
"2 4\n"
"4 2\n"
@@ -10319,17 +10319,17 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($vec->view()->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$mp = Map {0 => 'a', 3 => 'b', 6 => 'c'};\n"
"foreach ($mp->view()->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$smp = StableMap {0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'};\n"
"foreach ($smp->view()->keys()->map($mapFn)->filter($filtFn) as $x) {\n"
" var_dump($x);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$v = Vector {0, 1, 2, 3, 4};\n"
"$iterable = $v->view()\n"
" ->map(function ($x) { return $x+1; })\n"
@@ -10342,12 +10342,12 @@ bool TestCodeRun::TestCollectionClasses() {
,
"int(2)\n"
"int(4)\n"
"========\n"
"------------------------\n"
"int(4)\n"
"========\n"
"------------------------\n"
"int(4)\n"
"int(10)\n"
"========\n"
"------------------------\n"
"2 2\n"
"2 4\n"
"4 2\n"
@@ -10360,13 +10360,13 @@ bool TestCodeRun::TestCollectionClasses() {
"foreach ($c1->zip($c2) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$c1 = Vector {1, 4, 7, 10};\n"
"$c2 = StableMap {'a' => 0, 'b' => 3, 'c' => 6};\n"
"foreach ($c1->zip($c2) as $k => $v) {\n"
" var_dump($k, $v);\n"
"}\n"
"echo \"========\\n\";\n"
"echo \"------------------------\\n\";\n"
"$c1 = Pair {1, 4};\n"
"$c2 = StableMap {'a' => 0, 'b' => 3, 'c' => 6};\n"
"foreach ($c1->zip($c2) as $k => $v) {\n"
@@ -10394,7 +10394,7 @@ bool TestCodeRun::TestCollectionClasses() {
" [1]=>\n"
" int(7)\n"
"}\n"
"========\n"
"------------------------\n"
"int(0)\n"
"object(Pair)#10 (2) {\n"
" [0]=>\n"
@@ -10416,7 +10416,7 @@ bool TestCodeRun::TestCollectionClasses() {
" [1]=>\n"
" int(6)\n"
"}\n"
"========\n"
"------------------------\n"
"int(0)\n"
"object(Pair)#16 (2) {\n"
" [0]=>\n"