Skip to content

Commit

Permalink
Remove -ES6Lambda feature switch
Browse files Browse the repository at this point in the history 
Re issue chakra-core#6
  • Loading branch information
Ian Halliday committed Jan 25, 2016
1 parent 9f00b44 commit 489eabf
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 26 deletions.
7 changes: 2 additions & 5 deletions lib/Parser/scan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2078,11 +2078,8 @@ tokens Scanner<EncodingPolicy>::ScanCore(bool identifyKwds)
}
break;
case '>':
if (m_scriptContext->GetConfig()->IsES6LambdaEnabled())
{
p++;
token = tkDArrow;
}
p++;
token = tkDArrow;
break;
}
break;
Expand Down
1 change: 0 additions & 1 deletion lib/Runtime/Base/ThreadConfigFlagsList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ FLAG_RELEASE(IsES7TrailingCommaEnabled, ES7TrailingComma)
FLAG_RELEASE(IsES7BuiltinsEnabled, ES7Builtins)
FLAG_RELEASE(IsES6IteratorsEnabled, ES6Iterators)
FLAG_RELEASE(IsES6IsConcatSpreadableEnabled, ES6IsConcatSpreadable)
FLAG_RELEASE(IsES6LambdaEnabled, ES6Lambda)
FLAG_RELEASE(IsES6MathExtensionsEnabled, ES6Math)
FLAG_RELEASE(IsES6ObjectExtensionsEnabled, ES6Object)
FLAG_RELEASE(IsES6NumberExtensionsEnabled, ES6Number)
Expand Down
2 changes: 0 additions & 2 deletions lib/common/ConfigFlagsList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,6 @@ PHASE(All)
#define DEFAULT_CONFIG_ES6Generators (true)
#define DEFAULT_CONFIG_ES6Iterators (true)
#define DEFAULT_CONFIG_ES6IsConcatSpreadable (false)
#define DEFAULT_CONFIG_ES6Lambda (true)
#define DEFAULT_CONFIG_ES6Math (true)
#define DEFAULT_CONFIG_ES6Object (true)
#define DEFAULT_CONFIG_ES6Number (true)
Expand Down Expand Up @@ -876,7 +875,6 @@ FLAGPR_REGOVR_EXP(Boolean, ES6, ES7Builtins , "Enable ES7 built-ins"
FLAGPR (Boolean, ES6, ES7TrailingComma , "Enable ES7 trailing comma in function" , DEFAULT_CONFIG_ES7TrailingComma)
FLAGPR (Boolean, ES6, ES6Iterators , "Enable ES6 iterators" , DEFAULT_CONFIG_ES6Iterators)
FLAGPR (Boolean, ES6, ES6IsConcatSpreadable , "Enable ES6 isConcatSpreadable Symbol" , DEFAULT_CONFIG_ES6IsConcatSpreadable)
FLAGPR (Boolean, ES6, ES6Lambda , "Enable ES6 lambdas" , DEFAULT_CONFIG_ES6Lambda)
FLAGPR (Boolean, ES6, ES6Math , "Enable ES6 Math extensions" , DEFAULT_CONFIG_ES6Math)
FLAGPR (Boolean, ES6, ES6Object , "Enable ES6 Object extensions" , DEFAULT_CONFIG_ES6Object)
FLAGPR (Boolean, ES6, ES6Number , "Enable ES6 Number extensions" , DEFAULT_CONFIG_ES6Number)
Expand Down
2 changes: 0 additions & 2 deletions test/es6/es6_all.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ FLAG ES6 = 1 - setting child flag ES6Iterators = 1
FLAG ES6Iterators = 1
FLAG ES6 = 1 - setting child flag ES6IsConcatSpreadable = 1
FLAG ES6IsConcatSpreadable = 1
FLAG ES6 = 1 - setting child flag ES6Lambda = 1
FLAG ES6Lambda = 1
FLAG ES6 = 1 - setting child flag ES6Math = 1
FLAG ES6Math = 1
FLAG ES6 = 1 - setting child flag ES6Object = 1
Expand Down
2 changes: 0 additions & 2 deletions test/es6/es6_stable.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ FLAG ES6 = 1 - setting child flag ES6Iterators = 1
FLAG ES6Iterators = 1
FLAG ES6 = 1 - setting child flag ES6IsConcatSpreadable = 0
FLAG ES6IsConcatSpreadable = 0
FLAG ES6 = 1 - setting child flag ES6Lambda = 1
FLAG ES6Lambda = 1
FLAG ES6 = 1 - setting child flag ES6Math = 1
FLAG ES6Math = 1
FLAG ES6 = 1 - setting child flag ES6Object = 1
Expand Down
4 changes: 0 additions & 4 deletions test/es6/es6_stable.enable_disable.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ FLAG ES6 = 1 - setting child flag ES6Iterators = 1
FLAG ES6Iterators = 1
FLAG ES6 = 1 - setting child flag ES6IsConcatSpreadable = 0
FLAG ES6IsConcatSpreadable = 0
FLAG ES6 = 1 - setting child flag ES6Lambda = 1
FLAG ES6Lambda = 1
FLAG ES6 = 1 - setting child flag ES6Math = 1
FLAG ES6Math = 1
FLAG ES6 = 1 - setting child flag ES6Object = 1
Expand Down Expand Up @@ -118,8 +116,6 @@ FLAG ES6 = 0 - setting child flag ES6Iterators = 0
FLAG ES6Iterators = 0
FLAG ES6 = 0 - setting child flag ES6IsConcatSpreadable = 0
FLAG ES6IsConcatSpreadable = 0
FLAG ES6 = 0 - setting child flag ES6Lambda = 0
FLAG ES6Lambda = 0
FLAG ES6 = 0 - setting child flag ES6Math = 0
FLAG ES6Math = 0
FLAG ES6 = 0 - setting child flag ES6Object = 0
Expand Down
20 changes: 10 additions & 10 deletions test/es6/rlexe.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<test>
<default>
<files>lambda1.js</files>
<compile-flags> -es6lambda -off:deferparse -args summary -endargs</compile-flags>
<compile-flags>-off:deferparse -args summary -endargs</compile-flags>
</default>
</test>
<test>
<default>
<files>lambda1.js</files>
<compile-flags> -es6lambda -force:deferparse -args summary -endargs</compile-flags>
<compile-flags>-force:deferparse -args summary -endargs</compile-flags>
</default>
</test>
<test>
Expand Down Expand Up @@ -280,54 +280,54 @@
<test>
<default>
<files>classes.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Off:Deferparse</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Off:Deferparse</compile-flags>
<baseline>classes.baseline</baseline>
</default>
</test>
<test>
<default>
<files>classes.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Force:Deferparse</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Force:Deferparse</compile-flags>
<baseline>classes.baseline</baseline>
</default>
</test>
<test>
<default>
<files>classes_bugfixes.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Off:Deferparse -args summary -endargs</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Off:Deferparse -args summary -endargs</compile-flags>
<tags>BugFix</tags>
</default>
</test>
<test>
<default>
<files>classes_bugfixes.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Force:Deferparse -args summary -endargs</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Force:Deferparse -args summary -endargs</compile-flags>
<tags>BugFix</tags>
</default>
</test>
<test>
<default>
<files>ES6SubclassableBuiltins.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Off:Deferparse -args summary -endargs</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Off:Deferparse -args summary -endargs</compile-flags>
</default>
</test>
<test>
<default>
<files>ES6SubclassableBuiltins.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Force:Deferparse -args summary -endargs</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Force:Deferparse -args summary -endargs</compile-flags>
</default>
</test>
<test>
<default>
<files>ES6SubclassableAsync.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Off:Deferparse</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Off:Deferparse</compile-flags>
<baseline>ES6SubclassableAsync.baseline</baseline>
</default>
</test>
<test>
<default>
<files>ES6SubclassableAsync.js</files>
<compile-flags>-ES6Classes -ES6Lambda -ES6Spread -ES6Generators -Force:Deferparse</compile-flags>
<compile-flags>-ES6Classes -ES6Spread -ES6Generators -Force:Deferparse</compile-flags>
<baseline>ES6SubclassableAsync.baseline</baseline>
</default>
</test>
Expand Down

0 comments on commit 489eabf

Please sign in to comment.