feat(askscript): allow else if construct

src/askscript/__tests__/00-documentation-examples/documentation01-complete_example.ast.tsx

@@ -46,6 +46,7 @@ export = (
                 }
               />
             }
+            elseBlock={false}
           >
             <return value={<ref name="n" />} />
           </if>

src/askscript/__tests__/00-documentation-examples/documentation10-function.ast.tsx

@@ -1,6 +1,6 @@
 export = (
   <ask args={<list />} returns={<ref name="string" />}>
-    <if condition={<call name="checkThis" args={<list />} />}>
+    <if condition={<call name="checkThis" args={<list />} />} elseBlock={false}>
       <return value="your string" />
     </if>
     {"my string"}

src/askscript/__tests__/00-documentation-examples/documentation14-code_blocks.ast.tsx

@@ -27,6 +27,7 @@ export = (
                 }
               />
             }
+            elseBlock={false}
           >
             <return value={<ref name="n" />} />
           </if>

src/askscript/__tests__/00-documentation-examples/documentation14-if.ast.tsx

@@ -12,6 +12,7 @@ export = (
           }
         />
       }
+      elseBlock={false}
     >
       <return value={<ref name="n" />} />
     </if>

src/askscript/__tests__/00-getting-started/getting-started-03.ast.tsx

@@ -27,6 +27,7 @@ export = (
                 }
               />
             }
+            elseBlock={false}
           >
             <return value={<ref name="n" />} />
           </if>

src/askscript/__tests__/04-control-flow/control-flow-08d-for_of_string.ast.tsx

@@ -43,6 +43,7 @@ export = (
             />
           </list>
         }
+        elseBlock={true}
       >
         <assign
           name="newStr"

src/askscript/__tests__/04-control-flow/control-flow-08d-for_of_string_whitespace.ast.tsx

@@ -43,6 +43,7 @@ export = (
             />
           </list>
         }
+        elseBlock={true}
       >
         <assign
           name="newStr"

src/askscript/__tests__/04-control-flow/control-flow-09d-for_in_string.ast.tsx

@@ -58,6 +58,7 @@ export = (
             />
           </list>
         }
+        elseBlock={true}
       >
         <assign
           name="newStr"

src/askscript/__tests__/04-control-flow/control-flow-09d-for_in_string_whitespace.ast.tsx

@@ -58,6 +58,7 @@ export = (
             />
           </list>
         }
+        elseBlock={true}
       >
         <assign
           name="newStr"

src/askscript/__tests__/04-control-flow/program10-if.ast.tsx

@@ -12,6 +12,7 @@ export = (
           }
         />
       }
+      elseBlock={false}
     >
       <return value={<ref name="a" />} />
     </if>

src/askscript/__tests__/04-control-flow/program10-if_whitespace.ast.tsx

@@ -12,6 +12,7 @@ export = (
           }
         />
       }
+      elseBlock={false}
     >
       <return value={<ref name="a" />} />
     </if>

src/askscript/__tests__/04-control-flow/program10b-if_else.ast.tsx

@@ -7,6 +7,7 @@ export = (
           <return value={<ref name="no" />} />
         </list>
       }
+      elseBlock={true}
     >
       <return value={<ref name="yes" />} />
     </if>

src/askscript/__tests__/04-control-flow/program10d_0a-if_else_if_else.ask

@@ -0,0 +1,6 @@
+ask {
+    let len = 10
+    if (len == 10) {
+        return '0AP';
+    } 
+}

src/askscript/__tests__/04-control-flow/program10d_0a-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),10),block(return('0AP')),block()))

src/askscript/__tests__/04-control-flow/program10d_0a-if_else_if_else.ast.tsx

@@ -0,0 +1,22 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {10}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      elseBlock={false}
+    >
+      <return value="0AP" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_0a-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = '0AP';

src/askscript/__tests__/04-control-flow/program10d_0b-if_else_if_else.ask

@@ -0,0 +1,6 @@
+ask {
+    let len = 10
+    if (len == 12) {
+        return '0BF';
+    } 
+}

src/askscript/__tests__/04-control-flow/program10d_0b-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),12),block(return('0BF')),block()))

src/askscript/__tests__/04-control-flow/program10d_0b-if_else_if_else.ast.tsx

@@ -0,0 +1,22 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {12}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      elseBlock={false}
+    >
+      <return value="0BF" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_0b-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = null;

src/askscript/__tests__/04-control-flow/program10d_0c-if_else_if_else.ask

@@ -0,0 +1,8 @@
+ask {
+    let len = 10
+    if (len == 12) {
+        return '0CF';
+    } else if (len == 10) {
+        return '0CP';
+    }
+}

src/askscript/__tests__/04-control-flow/program10d_0c-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),12),block(return('0CF')),block(if(call(get('=='),call(get('get'),'len'),10),block(return('0CP')),block()))))

src/askscript/__tests__/04-control-flow/program10d_0c-if_else_if_else.ast.tsx

@@ -0,0 +1,41 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {12}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      else={
+        <if
+          condition={
+            <call
+              name="=="
+              args={
+                <list>
+                  <ref name="len" />
+                  {10}
+                </list>
+              }
+              isOperator={true}
+            />
+          }
+          elseBlock={false}
+        >
+          <return value="0CP" />
+        </if>
+      }
+      elseBlock={false}
+    >
+      <return value="0CF" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_0c-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = '0CP';

src/askscript/__tests__/04-control-flow/program10d_0d-if_else_if_else.ask

@@ -0,0 +1,8 @@
+ask {
+    let len = 10
+    if (len == 12) {
+        return '0DF';
+    } else if (len == 14) {
+        return '0DF';
+    }
+}

src/askscript/__tests__/04-control-flow/program10d_0d-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),12),block(return('0DF')),block(if(call(get('=='),call(get('get'),'len'),14),block(return('0DF')),block()))))

src/askscript/__tests__/04-control-flow/program10d_0d-if_else_if_else.ast.tsx

@@ -0,0 +1,41 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {12}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      else={
+        <if
+          condition={
+            <call
+              name="=="
+              args={
+                <list>
+                  <ref name="len" />
+                  {14}
+                </list>
+              }
+              isOperator={true}
+            />
+          }
+          elseBlock={false}
+        >
+          <return value="0DF" />
+        </if>
+      }
+      elseBlock={false}
+    >
+      <return value="0DF" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_0d-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = null;

src/askscript/__tests__/04-control-flow/program10d_1a-if_else_if_else.ask

@@ -0,0 +1,8 @@
+ask {
+    let len = 10
+    if (len == 10) {
+        return '1AP';
+    } else {
+        return '1AF';
+    }
+}

src/askscript/__tests__/04-control-flow/program10d_1a-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),10),block(return('1AP')),block(list(return('1AF')))))

src/askscript/__tests__/04-control-flow/program10d_1a-if_else_if_else.ast.tsx

@@ -0,0 +1,27 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {10}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      else={
+        <list>
+          <return value="1AF" />
+        </list>
+      }
+      elseBlock={true}
+    >
+      <return value="1AP" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_1a-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = '1AP';

src/askscript/__tests__/04-control-flow/program10d_1b-if_else_if_else.ask

@@ -0,0 +1,8 @@
+ask {
+    let len = 10
+    if (len == 12) {
+        return '1BF';
+    } else {
+        return '1BP';
+    }
+}

src/askscript/__tests__/04-control-flow/program10d_1b-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),12),block(return('1BF')),block(list(return('1BP')))))

src/askscript/__tests__/04-control-flow/program10d_1b-if_else_if_else.ast.tsx

@@ -0,0 +1,27 @@
+export = (
+  <ask args={<list />}>
+    <let name="len" type={<ref name="any" />} value={10} />
+    <if
+      condition={
+        <call
+          name="=="
+          args={
+            <list>
+              <ref name="len" />
+              {12}
+            </list>
+          }
+          isOperator={true}
+        />
+      }
+      else={
+        <list>
+          <return value="1BP" />
+        </list>
+      }
+      elseBlock={true}
+    >
+      <return value="1BF" />
+    </if>
+  </ask>
+);

src/askscript/__tests__/04-control-flow/program10d_1b-if_else_if_else.test.result.ts

@@ -0,0 +1 @@
+export = '1BP';

src/askscript/__tests__/04-control-flow/program10d_2a-if_else_if_else.ask

@@ -0,0 +1,10 @@
+ask {
+    let len = 10
+    if (len == 10) {
+        return '2AP';
+    } else if (len == 12) {
+        return '2AF';
+    } else {
+        return '2AF';
+    }
+}

src/askscript/__tests__/04-control-flow/program10d_2a-if_else_if_else.askcode

@@ -0,0 +1 @@
+ask(let('len',10),if(call(get('=='),call(get('get'),'len'),10),block(return('2AP')),block(if(call(get('=='),call(get('get'),'len'),12),block(return('2AF')),block(list(return('2AF')))))))