Fix function-expression test

Author: dcodeIO

tests/compiler/function-expression.json

@@ -1,7 +1,4 @@
 {
   "asc_flags": [
-  ],
-  "stderr": [
-    "TS2300: Duplicate identifier 'a'"
   ]
 }

tests/compiler/function-expression.optimized.wat

@@ -1,16 +1,12 @@
 (module
-<<<<<<< HEAD
-=======
- (type $i32_=>_i32 (func (param i32) (result i32)))
->>>>>>> master
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $none_=>_none (func))
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_=>_none (func (param i32 i32)))
- (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (type $i64_=>_i64 (func (param i64) (result i64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -1119,22 +1115,13 @@
        local.get $0
        i32.const 15
        i32.and
-<<<<<<< HEAD
-       i32.eqz
-       i32.const 0
-       local.get $0
-       select
-       if (result i32)
-        local.get $1
-=======
        i32.const 1
-       local.get $1
+       local.get $0
        select
        if (result i32)
         i32.const 1
        else
-        local.get $0
->>>>>>> master
+        local.get $1
         i32.load
         i32.const 1
         i32.and
@@ -1445,7 +1432,6 @@
   i32.store offset=4
   local.get $0
   local.get $1
-<<<<<<< HEAD
   i32.store offset=8
   local.get $1
   local.get $0
@@ -1458,73 +1444,6 @@
   local.get $2
   local.get $0
   i32.store offset=8
-=======
- )
- (func $~lib/rt/itcms/__new (result i32)
-  (local $0 i32)
-  (local $1 i32)
-  global.get $~lib/rt/itcms/total
-  global.get $~lib/rt/itcms/threshold
-  i32.ge_u
-  if
-   block $__inlined_func$~lib/rt/itcms/interrupt
-    i32.const 2048
-    local.set $0
-    loop $do-continue|0
-     local.get $0
-     call $~lib/rt/itcms/step
-     i32.sub
-     local.set $0
-     global.get $~lib/rt/itcms/state
-     i32.eqz
-     if
-      global.get $~lib/rt/itcms/total
-      i64.extend_i32_u
-      i64.const 200
-      i64.mul
-      i64.const 100
-      i64.div_u
-      i32.wrap_i64
-      i32.const 1024
-      i32.add
-      global.set $~lib/rt/itcms/threshold
-      br $__inlined_func$~lib/rt/itcms/interrupt
-     end
-     local.get $0
-     i32.const 0
-     i32.gt_s
-     br_if $do-continue|0
-    end
-    global.get $~lib/rt/itcms/total
-    global.get $~lib/rt/itcms/total
-    global.get $~lib/rt/itcms/threshold
-    i32.sub
-    i32.const 1024
-    i32.lt_u
-    i32.const 10
-    i32.shl
-    i32.add
-    global.set $~lib/rt/itcms/threshold
-   end
-  end
-  global.get $~lib/rt/tlsf/ROOT
-  i32.eqz
-  if
-   call $~lib/rt/tlsf/initialize
-  end
-  global.get $~lib/rt/tlsf/ROOT
-  call $~lib/rt/tlsf/allocateBlock
-  local.tee $0
-  i32.const 8
-  i32.store offset=12
-  local.get $0
-  i32.const 4
-  i32.store offset=16
-  local.get $0
-  global.get $~lib/rt/itcms/fromSpace
-  global.get $~lib/rt/itcms/white
-  call $~lib/rt/itcms/Object#linkTo
->>>>>>> master
   global.get $~lib/rt/itcms/total
   local.get $0
   i32.load

tests/compiler/function-expression.ts

@@ -93,7 +93,3 @@ export function semanticallyAnonymous(): void {
   assert(fnDecl != exprDecl);
 }
 semanticallyAnonymous();
-
-var duplicateParams = (a: i32, a: i32): void => {};
-// TS2300: Duplicate identifier 'a'
-duplicateParams(1, 2);