fix format.007

masak · Mar 10, 2016 · ef1433b · ef1433b
1 parent 80d4cbf
commit ef1433b
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/examples/format.007 b/examples/format.007
@@ -14,6 +14,29 @@ macro format(fmt, args) {
             transform);
     }
 
+    sub findHighestIndex(input) {
+        my openBracePos = input.index("{");
+        if openBracePos == -1 {
+            return -1;
+        }
+        my closeBracePos = input.suffix(openBracePos).index("}");
+        if closeBracePos == -1 {
+            return -1;
+        }
+
+        my index = int(input.substr(openBracePos + 1, closeBracePos - 1));
+
+        return max(index, findHighestIndex(
+            input.suffix(openBracePos + closeBracePos + 1)));
+    }
+
+    if fmt ~~ Q::Literal::Str {
+        my highestUsedIndex = findHighestIndex(fmt.value);
+        if args ~~ Q::Term::Array && args.elements.elems() <= highestUsedIndex {
+            args.elements[highestUsedIndex];
+        }
+    }
+
     return quasi {
         replaceAll({{{fmt}}}, "", sub transform(arg) {
             return {{{args}}}[int(arg)];
@@ -23,3 +46,4 @@ macro format(fmt, args) {
 
 say( format("{0}{1}{0}", ["abra", "cad"]) );
 say( format("foo{0}bar", ["{1}"]) );
+say( format("foo{1}bar", ["foo"]) );