forked from pearu/f2py
-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Empty only #118 #122
Merged
Merged
Empty only #118 #122
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ae373c5
issue #118. Fixed the bug.
rupertford 2e33b94
issue #118. Added initial set of tests and fixed a bug.
rupertford ccefbf3
issue #118. Completed tests and updated Python code with internalerrors.
rupertford 7cee0e4
issue #118. Tidying code.
rupertford d987f6d
issue #118 pr #122. Merge branch 'master' into empty_only
rupertford 00141af
pr #122. Addressing reviewers comments.
rupertford e1b8fe1
PR #122, I #118: Updated changelog, ready for merge to master.
TeranIvy ac127f0
PR #122, I #118: Merge branch 'master' into empty_only before edit to…
TeranIvy 65e5280
PR #122, I #118: Updated changelog, ready for merge to master.
TeranIvy File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
221 changes: 221 additions & 0 deletions
221
src/fparser/two/tests/fortran2003/test_usestmt_r1109.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,221 @@ | ||
# Copyright (c) 2018 Science and Technology Facilities Council | ||
|
||
# All rights reserved. | ||
|
||
# Modifications made as part of the fparser project are distributed | ||
# under the following license: | ||
|
||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are | ||
# met: | ||
|
||
# 1. Redistributions of source code must retain the above copyright | ||
# notice, this list of conditions and the following disclaimer. | ||
|
||
# 2. Redistributions in binary form must reproduce the above copyright | ||
# notice, this list of conditions and the following disclaimer in the | ||
# documentation and/or other materials provided with the distribution. | ||
|
||
# 3. Neither the name of the copyright holder nor the names of its | ||
# contributors may be used to endorse or promote products derived from | ||
# this software without specific prior written permission. | ||
|
||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
'''Test Fortran 2003 rule R1109 : This file tests the support for the | ||
Use statement. | ||
|
||
''' | ||
|
||
import pytest | ||
from fparser.api import get_reader | ||
from fparser.two.Fortran2003 import Use_Stmt | ||
from fparser.two.utils import NoMatchError, InternalError | ||
|
||
# match() use ... | ||
|
||
|
||
# match() 'use x'. Use both string and reader input here, but from | ||
# here on we will just use string input as that is what is passed to | ||
# the match() method | ||
def test_use(f2003_create): | ||
'''Check that a basic use is parsed correctly. Input separately as a | ||
string and as a reader object | ||
|
||
''' | ||
def check_use(reader): | ||
'''Internal helper function to avoid code replication.''' | ||
ast = Use_Stmt(reader) | ||
assert "USE my_model" in str(ast) | ||
assert repr(ast) == "Use_Stmt(None, None, Name('my_model'), '', None)" | ||
|
||
line = "use my_model" | ||
check_use(line) | ||
reader = get_reader(line) | ||
check_use(reader) | ||
|
||
|
||
# match() 'use :: x' | ||
def test_use_colons(f2003_create): | ||
'''Check that a basic use with '::' is parsed correctly.''' | ||
line = "use :: my_model" | ||
ast = Use_Stmt(line) | ||
assert "USE :: my_model" in str(ast) | ||
assert repr(ast) == "Use_Stmt(None, '::', Name('my_model'), '', None)" | ||
|
||
|
||
# match() 'use, nature :: x' | ||
def test_use_nature(f2003_create): | ||
'''Check that a use with a 'nature' specification is parsed correctly.''' | ||
line = "use, intrinsic :: my_model" | ||
ast = Use_Stmt(line) | ||
assert "USE, INTRINSIC :: my_model" in str(ast) | ||
assert repr(ast) == ( | ||
"Use_Stmt(Module_Nature('INTRINSIC'), '::', Name('my_model'), " | ||
"'', None)") | ||
|
||
|
||
# match() 'use x, rename' | ||
def test_use_rename(f2003_create): | ||
'''Check that a use with a nename clause is parsed correctly.''' | ||
line = "use my_module, name=>new_name" | ||
ast = Use_Stmt(line) | ||
assert "USE my_module, name => new_name" in str(ast) | ||
assert repr(ast) == ( | ||
"Use_Stmt(None, None, Name('my_module'), ',', " | ||
"Rename(None, Name('name'), Name('new_name')))") | ||
|
||
|
||
# match() 'use x, only: y' | ||
def test_use_only(f2003_create): | ||
'''Check that a use statement is parsed correctly when there is an | ||
only clause. | ||
|
||
''' | ||
line = "use my_model, only: name" | ||
ast = Use_Stmt(line) | ||
assert "USE my_model, ONLY: name" in str(ast) | ||
assert repr(ast) == ( | ||
"Use_Stmt(None, None, Name('my_model'), ', ONLY:', Name('name'))") | ||
|
||
|
||
# match() 'use x, only:' | ||
def test_use_only_empty(f2003_create): | ||
'''Check that a use statement is parsed correctly when there is an | ||
only clause without any content. | ||
|
||
''' | ||
line = "use my_model, only:" | ||
ast = Use_Stmt(line) | ||
assert "USE my_model, ONLY:" in str(ast) | ||
assert repr(ast) == ( | ||
"Use_Stmt(None, None, Name('my_model'), ', ONLY:', None)") | ||
|
||
|
||
# match() ' use , nature :: x , name=>new_name' | ||
def test_use_spaces_1(f2003_create): | ||
'''Check that a use statement with spaces works correctly with | ||
renaming. | ||
|
||
''' | ||
line = " Use , intrinsic :: my_model , name=>new_name " | ||
ast = Use_Stmt(line) | ||
assert "USE, INTRINSIC :: my_model, name => new_name" in str(ast) | ||
assert repr(ast) == ( | ||
"Use_Stmt(Module_Nature('INTRINSIC'), '::', Name('my_model'), ',', " | ||
"Rename(None, Name('name'), Name('new_name')))") | ||
|
||
|
||
# match() ' use , nature :: x , only : name' | ||
def test_use_spaces_2(f2003_create): | ||
'''Check that a use statement with spaces works correctly with an only | ||
clause. | ||
|
||
''' | ||
line = " use , intrinsic :: my_model , only : name " | ||
ast = Use_Stmt(line) | ||
assert "USE, INTRINSIC :: my_model, ONLY: name" in str(ast) | ||
assert repr(ast) == ("Use_Stmt(Module_Nature('INTRINSIC'), '::', " | ||
"Name('my_model'), ', ONLY:', Name('name'))") | ||
|
||
|
||
# match() mixed case | ||
def test_use_mixed_case(f2003_create): | ||
'''Check that a use statement with mixed case keywords ('use' and | ||
'only') works as expected. | ||
|
||
''' | ||
line = "UsE my_model, OnLy: name" | ||
ast = Use_Stmt(line) | ||
assert "USE my_model, ONLY: name" in str(ast) | ||
assert repr(ast) == ("Use_Stmt(None, None, Name('my_model'), ', ONLY:', " | ||
"Name('name'))") | ||
|
||
# match() Syntax errors | ||
|
||
|
||
def test_syntaxerror(f2003_create): | ||
'''Test that NoMatchError is raised for various syntax errors.''' | ||
for line in ["us", "ust", "use", "usemy_model", "use, ", "use, ::", | ||
"use, intrinsic", "use, intrinsic::", | ||
"use, intrinsic my_module", "use,", "use my_model,", | ||
"use my_model, only", "use my_model, only ;", | ||
"use my_model, only name"]: | ||
with pytest.raises(NoMatchError) as excinfo: | ||
_ = Use_Stmt(line) | ||
assert "Use_Stmt: '{0}'".format(line) in str(excinfo) | ||
|
||
# match() Internal errors | ||
|
||
|
||
def test_use_internal_error1(f2003_create): | ||
'''Check that an internal error is raised if the length of the Items | ||
list is not 5 as the str() method assumes that it is. | ||
|
||
''' | ||
line = "use my_model" | ||
ast = Use_Stmt(line) | ||
ast.items = (None, None, None, None) | ||
with pytest.raises(InternalError) as excinfo: | ||
str(ast) | ||
assert "should be of size 5 but found '4'" in str(excinfo) | ||
|
||
|
||
def test_use_internal_error2(f2003_create): | ||
'''Check that an internal error is raised if the module name (entry 2 | ||
of Items) is empty or None as the str() method assumes that it is | ||
a string with content. | ||
|
||
''' | ||
line = "use my_model" | ||
ast = Use_Stmt(line) | ||
for content in [None, ""]: | ||
ast.items = (None, None, content, None, None) | ||
with pytest.raises(InternalError) as excinfo: | ||
str(ast) | ||
assert ("entry 2 should be a module name but it is " | ||
"empty") in str(excinfo) | ||
|
||
|
||
def test_use_internal_error3(f2003_create): | ||
'''Check that an internal error is raised if entry 3 of Items is | ||
'None' as the str() method assumes it is a (potentially empty) | ||
string. | ||
|
||
''' | ||
line = "use my_model" | ||
ast = Use_Stmt(line) | ||
ast.items = (None, None, "my_module", None, None) | ||
with pytest.raises(InternalError) as excinfo: | ||
str(ast) | ||
assert "entry 3 should be a string but found 'None'" in str(excinfo) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment describes nicely what the
if
test does. It is quite similar to the comment in line 7318 which is not the best description of what theif
test in 7319 does (tests that character afterONLY
is not the permitted:
).Would you kindly update the comment in 7318? I am aware the original developer made it unclear :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've hopefully made it more clear :-)