Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
b5b38d37
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b5b38d37
编写于
7月 01, 2013
作者:
S
sundar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8019473: Parser issues related to functions and blocks
Reviewed-by: lagergren
上级
5a3d0cf9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
3 deletion
+67
-3
nashorn/src/jdk/nashorn/internal/parser/Parser.java
nashorn/src/jdk/nashorn/internal/parser/Parser.java
+5
-3
nashorn/test/script/basic/JDK-8019473.js
nashorn/test/script/basic/JDK-8019473.js
+62
-0
未找到文件。
nashorn/src/jdk/nashorn/internal/parser/Parser.java
浏览文件 @
b5b38d37
...
...
@@ -767,8 +767,6 @@ loop:
case
LBRACE:
block
();
break
;
case
RBRACE:
break
;
case
VAR:
variableStatement
(
true
);
break
;
...
...
@@ -1267,6 +1265,7 @@ loop:
case
RBRACE:
case
SEMICOLON:
case
EOL:
case
EOF:
break
;
default
:
...
...
@@ -1314,6 +1313,7 @@ loop:
case
RBRACE:
case
SEMICOLON:
case
EOL:
case
EOF:
break
;
default
:
...
...
@@ -1368,6 +1368,7 @@ loop:
case
RBRACE:
case
SEMICOLON:
case
EOL:
case
EOF:
break
;
default
:
...
...
@@ -1403,6 +1404,7 @@ loop:
case
RBRACE:
case
SEMICOLON:
case
EOL:
case
EOF:
break
;
default
:
...
...
@@ -2566,7 +2568,7 @@ loop:
*/
// just expression as function body
final
Node
expr
=
expression
(
);
final
Node
expr
=
assignmentExpression
(
true
);
assert
lc
.
getCurrentBlock
()
==
lc
.
getFunctionBody
(
functionNode
);
// create a return statement - this creates code in itself and does not need to be
// wrapped into an ExecuteNode
...
...
nashorn/test/script/basic/JDK-8019473.js
0 → 100644
浏览文件 @
b5b38d37
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* JDK-8019473: Parser issues related to functions and blocks
*
* @test
* @run
*/
function
checkNoError
(
code
)
{
try
{
Function
(
code
);
}
catch
(
e
)
{
print
(
"
no error expected for:
"
+
code
+
"
, got
"
+
e
);
}
}
// implicit newlines at EOF should be accepted
checkNoError
(
"
for(;;) continue
"
)
checkNoError
(
"
return
"
)
checkNoError
(
"
yield
"
)
checkNoError
(
"
for(;;) break
"
)
function
checkError
(
code
)
{
try
{
eval
(
code
);
print
(
"
SyntaxError expected for:
"
+
code
);
}
catch
(
e
)
{
if
(
!
(
e
instanceof
SyntaxError
))
{
fail
(
"
SyntaxError expected, got
"
+
e
);
}
}
}
checkError
(
"
function f() { case0: }
"
);
checkError
(
"
function f() { if(0) }
"
);
checkError
(
"
function f() { if(0); else }
"
);
checkError
(
"
function f() { while(0) }
"
);
// comma expression as closure expression
checkError
(
"
function sq(x) x, x*x
"
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录