Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
3f3e2b25
D
dragonwell8_nashorn
项目概览
openanolis
/
dragonwell8_nashorn
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_nashorn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3f3e2b25
编写于
6月 17, 2013
作者:
S
sundar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8016550: nashorn.option.no.syntax.extensions has the wrong default
Reviewed-by: hannesw, lagergren
上级
86d090bd
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
9 addition
and
21 deletion
+9
-21
make/project.properties
make/project.properties
+2
-1
src/jdk/nashorn/api/scripting/NashornScriptEngine.java
src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+1
-1
src/jdk/nashorn/internal/parser/Parser.java
src/jdk/nashorn/internal/parser/Parser.java
+1
-1
src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
+0
-4
src/jdk/nashorn/internal/runtime/resources/Options.properties
...jdk/nashorn/internal/runtime/resources/Options.properties
+5
-13
test/script/basic/moduleload.js
test/script/basic/moduleload.js
+0
-1
未找到文件。
make/project.properties
浏览文件 @
3f3e2b25
...
...
@@ -193,7 +193,8 @@ test262-test-sys-prop.test.js.enable.strict.mode=true
# list of test262 test dirs to be excluded
test262-test-sys-prop.test.js.exclude.dir
=
\
${test262.suite.dir}/intl402/
${test262.suite.dir}/intl402/
\
${test262.suite.dir}/bestPractice/
test262-test-sys-prop.test.failed.list.file
=
${build.dir}/test/failedTests
...
...
src/jdk/nashorn/api/scripting/NashornScriptEngine.java
浏览文件 @
3f3e2b25
...
...
@@ -72,7 +72,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
private
final
ScriptObject
global
;
// default options passed to Nashorn Options object
private
static
final
String
[]
DEFAULT_OPTIONS
=
new
String
[]
{
"-scripting"
,
"-
af"
,
"-
doe"
};
private
static
final
String
[]
DEFAULT_OPTIONS
=
new
String
[]
{
"-scripting"
,
"-doe"
};
NashornScriptEngine
(
final
NashornScriptEngineFactory
factory
,
final
ClassLoader
appLoader
)
{
this
(
factory
,
DEFAULT_OPTIONS
,
appLoader
);
...
...
src/jdk/nashorn/internal/parser/Parser.java
浏览文件 @
3f3e2b25
...
...
@@ -2403,7 +2403,7 @@ loop:
verifyStrictIdent
(
name
,
"function name"
);
}
else
if
(
isStatement
)
{
// Nashorn extension: anonymous function statements
if
(
env
.
_no_syntax_extensions
||
!
env
.
_anon_functions
)
{
if
(
env
.
_no_syntax_extensions
)
{
expect
(
IDENT
);
}
}
...
...
src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
浏览文件 @
3f3e2b25
...
...
@@ -56,9 +56,6 @@ public final class ScriptEnvironment {
/** Current Options object. */
private
final
Options
options
;
/** Always allow functions as statements */
public
final
boolean
_anon_functions
;
/** Size of the per-global Class cache size */
public
final
int
_class_cache_size
;
...
...
@@ -192,7 +189,6 @@ public final class ScriptEnvironment {
this
.
namespace
=
new
Namespace
();
this
.
options
=
options
;
_anon_functions
=
options
.
getBoolean
(
"anon.functions"
);
_class_cache_size
=
options
.
getInteger
(
"class.cache.size"
);
_compile_only
=
options
.
getBoolean
(
"compile.only"
);
_debug_lines
=
options
.
getBoolean
(
"debug.lines"
);
...
...
src/jdk/nashorn/internal/runtime/resources/Options.properties
浏览文件 @
3f3e2b25
...
...
@@ -59,7 +59,7 @@ nashorn.options.D.key = nashorn.option.D
## is_undocumented - should this option never appear in the online help. defaults to no.
## desc - description of what the option does
## default - default value of the option. e.g. debug.lines is true by default. Not set means option not available by default
## dependency - does this arg imply another arg
, e.g. scripting -> anon-functions
## dependency - does this arg imply another arg
.
## confict - does this arg conflict with another arg e.g trace && instrument
## value_next_arg - is the opton's value passed as next argument in command line?
##
...
...
@@ -77,16 +77,9 @@ nashorn.option.xhelp = { \
desc="Print extended help for command line flags."
\
}
nashorn.option.anon.functions
=
{
\
name="--anon-functions",
\
short_name="-af",
\
is_undocumented=true,
\
desc="Always allow functions as statements."
\
}
nashorn.option.class.cache.size
=
{
\
name="--class-cache-size",
\
short_name="-
-ccs",
\
short_name="-
ccs",
\
desc="Size of the Class cache size per global scope.",
\
is_undocumented=true,
\
type=Integer,
\
...
...
@@ -201,10 +194,10 @@ nashorn.option.loader.per.compile = { \
nashorn.option.no.syntax.extensions
=
{
\
name="--no-syntax-extensions",
\
short_name="-
-nse",
\
short_name="-
nse",
\
is_undocumented=true,
\
desc="No non-standard syntax extensions",
\
default=
-anon-functions=false
\
default=
false
\
}
nashorn.option.package
=
{
\
...
...
@@ -296,8 +289,7 @@ nashorn.option.strict = { \
nashorn.option.scripting
=
{
\
name="-scripting",
\
desc="Enable scripting features.",
\
dependency="--anon-functions=true"
\
desc="Enable scripting features."
\
}
nashorn.option.specialize.calls
=
{
\
...
...
test/script/basic/moduleload.js
浏览文件 @
3f3e2b25
...
...
@@ -25,7 +25,6 @@
* This loads "module.js" and calls the anonymous top-level function from it.
*
* @test
* @option --anon-functions
* @run
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录