Fixed bug with headTail pattern matching preventing more advanced matches

bryanjos · bryanjos · commit 165ece672aca · 2016-02-15T14:44:45.000-06:00
diff --git a/lib/elixir_script/translator/module.ex b/lib/elixir_script/translator/module.ex
@@ -57,8 +57,6 @@ defmodule ElixirScript.Translator.Module do
         body: imports ++ structs ++ private_functions ++ exported_functions ++ body ++ [default]
     }
 
-    IO.inspect(result.body)
-
     result
   end
 
diff --git a/lib/elixir_script/translator/pattern_matching.ex b/lib/elixir_script/translator/pattern_matching.ex
@@ -65,10 +65,10 @@ defmodule ElixirScript.Translator.PatternMatching do
     )
   end
 
-  def head_tail() do
+  def head_tail(headParameter, tailParameter) do
     JS.call_expression(
       @head_tail,
-      []
+      [headParameter, tailParameter]
     )
   end
 
@@ -138,7 +138,11 @@ defmodule ElixirScript.Translator.PatternMatching do
   end
 
   defp do_build_match([{:|, _, [head, tail]}], env) do
-    { [head_tail()], [Translator.translate!(head, env), Translator.translate!(tail, env)] }
+    { head_patterns, head_params } = do_build_match(head, env)
+    { tail_patterns, tail_params } = do_build_match(tail, env)
+    params = head_params ++ tail_params
+
+    { [head_tail(hd(head_patterns), hd(tail_patterns))], params }
   end
 
   defp do_build_match({:<>, _, [prefix, value]}, env) do
diff --git a/src/javascript/lib/core/bit_string.js b/src/javascript/lib/core/bit_string.js
@@ -6,7 +6,7 @@ class BitString {
 
     this.value = Object.freeze(this.process(args));
     this.length = this.value.length;
-    this.bit_size = this.raw_value.reduce((prev, current) => prev + current.size);
+    this.bit_size = this.raw_value().reduce((prev, current) => prev + current.size);
     this.byte_size = (this.bit_size / 8) + (this.bit_size % 8 > 0 ? 1 : 0);
   }
 
diff --git a/src/javascript/lib/core/patterns/resolvers.js b/src/javascript/lib/core/patterns/resolvers.js
@@ -64,7 +64,10 @@ function resolveVariable(): Function {
   };
 }
 
-function resolveHeadTail(): Function {
+function resolveHeadTail(pattern: Types.HeadTail): Function {
+  const headMatches = buildMatch(pattern.head);
+  const tailMatches = buildMatch(pattern.tail);
+
   return function(value: any, args: Array<any>): boolean {
     if(!Checks.is_array(value) || value.length < 2){
       return false;
@@ -73,10 +76,9 @@ function resolveHeadTail(): Function {
     const head = value[0];
     const tail = value.slice(1);
 
-    args.push(head);
-    args.push(tail);
-
-    return true;
+    if(headMatches(head, args) && tailMatches(tail, args)){
+      return true;
+    }
   };
 }
 
diff --git a/src/javascript/lib/core/patterns/types.js b/src/javascript/lib/core/patterns/types.js
@@ -29,7 +29,12 @@ export class Capture {
 }
 
 export class HeadTail {
-  constructor() {
+  head: any;
+  tail: any;
+
+  constructor(head: any = null, tail: any = null) {
+    this.head = head;
+    this.tail = tail;
   }
 }
 
@@ -67,8 +72,8 @@ export function capture(value: any): Capture {
   return new Capture(value);
 }
 
-export function headTail(): HeadTail {
-  return new HeadTail();
+export function headTail(head: any = null, tail: any = null): HeadTail {
+  return new HeadTail(head, tail);
 }
 
 export function type(type: any, objPattern: Object = {}): Type {
diff --git a/src/javascript/tests/patterns/defmatch.spec.js b/src/javascript/tests/patterns/defmatch.spec.js
@@ -123,7 +123,7 @@ describe('defmatch', () => {
 
     let fn = Patterns.defmatch(
       Patterns.make_case(
-        [Patterns.headTail()],
+        [Patterns.headTail($, $)],
         (head, tail) => tail
       )
     );

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ defmodule ElixirScript.Translator.Module do`
`57`	`57`	`body: imports ++ structs ++ private_functions ++ exported_functions ++ body ++ [default]`
`58`	`58`	`}`
`59`	`59`
`60`		`- IO.inspect(result.body)`
`61`		`-`
`62`	`60`	`result`
`63`	`61`	`end`
`64`	`62`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class BitString {`
`6`	`6`
`7`	`7`	`this.value = Object.freeze(this.process(args));`
`8`	`8`	`this.length = this.value.length;`
`9`		`- this.bit_size = this.raw_value.reduce((prev, current) => prev + current.size);`
	`9`	`+ this.bit_size = this.raw_value().reduce((prev, current) => prev + current.size);`
`10`	`10`	`this.byte_size = (this.bit_size / 8) + (this.bit_size % 8 > 0 ? 1 : 0);`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,12 @@ export class Capture {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`export class HeadTail {`
`32`		`- constructor() {`
	`32`	`+ head: any;`
	`33`	`+ tail: any;`
	`34`	`+`
	`35`	`+ constructor(head: any = null, tail: any = null) {`
	`36`	`+ this.head = head;`
	`37`	`+ this.tail = tail;`
`33`	`38`	`}`
`34`	`39`	`}`
`35`	`40`
`@@ -67,8 +72,8 @@ export function capture(value: any): Capture {`
`67`	`72`	`return new Capture(value);`
`68`	`73`	`}`
`69`	`74`
`70`		`-export function headTail(): HeadTail {`
`71`		`- return new HeadTail();`
	`75`	`+export function headTail(head: any = null, tail: any = null): HeadTail {`
	`76`	`+ return new HeadTail(head, tail);`
`72`	`77`	`}`
`73`	`78`
`74`	`79`	`export function type(type: any, objPattern: Object = {}): Type {`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ describe('defmatch', () => {`
`123`	`123`
`124`	`124`	`let fn = Patterns.defmatch(`
`125`	`125`	`Patterns.make_case(`
`126`		`- [Patterns.headTail()],`
	`126`	`+ [Patterns.headTail($, $)],`
`127`	`127`	`(head, tail) => tail`
`128`	`128`	`)`
`129`	`129`	`);`