Commit Graph

325 Commits

Author SHA1 Message Date
peter klausler 376d8f96d4 [flang] repackage SetOfChars as a class type
Original-commit: flang-compiler/f18@bae9199f62
Reviewed-on: https://github.com/flang-compiler/f18/pull/61
Tree-same-pre-rewrite: false
2018-04-19 11:21:06 -07:00
peter klausler 075fe789da [flang] Combine expected character sets of messages ending at same point from two alternatives.
Original-commit: flang-compiler/f18@a006ceef1d
Reviewed-on: https://github.com/flang-compiler/f18/pull/61
Tree-same-pre-rewrite: false
2018-04-19 11:21:04 -07:00
peter klausler f6accb372b [flang] debugging
Original-commit: flang-compiler/f18@02718dd6ef
Reviewed-on: https://github.com/flang-compiler/f18/pull/61
Tree-same-pre-rewrite: false
2018-04-19 11:21:04 -07:00
peter klausler 1730085e1b [flang] Define sets of characters; use them in parsing and messages.
Original-commit: flang-compiler/f18@d3ca565b59
Reviewed-on: https://github.com/flang-compiler/f18/pull/61
Tree-same-pre-rewrite: false
2018-04-19 11:21:03 -07:00
Tim Keith 934ad66682 [flang] Merge pull request flang-compiler/f18#60 from ThePortlandGroup/tsk2
Implement parse tree rewriting.

Original-commit: flang-compiler/f18@ac0c8ca08e
Reviewed-on: https://github.com/flang-compiler/f18/pull/60
2018-04-19 10:47:48 -07:00
Tim Keith 3d2120989a [flang] Move ConvertToAssignment into class StmtFunctionStmt.
Original-commit: flang-compiler/f18@e3eaca38fd
Reviewed-on: https://github.com/flang-compiler/f18/pull/60
2018-04-19 07:07:47 -07:00
Tim Keith 06f9d7901a [flang] Merge parse-tree-mutator.h into parse-tree-visitor.h
Use the latter for visiting and mutating and delete the former.

Original-commit: flang-compiler/f18@ac5a098ca7
Reviewed-on: https://github.com/flang-compiler/f18/pull/60
Tree-same-pre-rewrite: false
2018-04-18 16:49:42 -07:00
Tim Keith 6746a18e6b [flang] Address review comments.
Original-commit: flang-compiler/f18@d3a363d6cb
Reviewed-on: https://github.com/flang-compiler/f18/pull/60
Tree-same-pre-rewrite: false
2018-04-18 15:50:36 -07:00
Tim Keith 1c291436f5 [flang] Implement parse tree rewriting.
Add parse-tree-mutator.h like parse-tree-visitor.h except that the Walk
functions take non-const references to parse tree nodes so the Pre and
Post methods of the mutator that are passed around can make changes to
the parse tree.

Change ExecutionPart to be a class that wraps a list so that it can be
identified during parse tree walking.

Add Symbol* field to parser::Name for the result of symbol resolution.
In parse tree dumper, dump symbol when it is there instead of just name.

Add RewriteParseTree to walk the parse tree, fill in resolved symbols in
Name nodes, and make necessary changes to the structure. Currently that
consists of rewriting statement functions as array assignments when
appropriate.

In ResolveNames, call RewriteParseTree if the resolution was successful.
Recognize a statement function that comes after a mis-identified
statement function and report an error. resolve08.f90 tests this case.

Add -fdebug-dump-symbols to dump the scope tree and symbols in each scope.
This is implemented by DumpSymbols in resolve-names.cc. Add an optional
symbol to scopes that correspond to symbols (e.g. subprograms). Remove
debug output from ResolveNamesVisitor as this option can be used instead.

Original-commit: flang-compiler/f18@9cd3372265
Reviewed-on: https://github.com/flang-compiler/f18/pull/60
Tree-same-pre-rewrite: false
2018-04-18 15:06:35 -07:00
Peter Klausler bca1c7ed55 [flang] Merge pull request flang-compiler/f18#59 from ThePortlandGroup/pmk-messages
Messaging work

Original-commit: flang-compiler/f18@f6b879ab10
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
2018-04-17 17:09:43 -07:00
peter klausler 43c64d215a [flang] Defer message accumulation until it is known that messages will be produced.
Original-commit: flang-compiler/f18@8485d44efd
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
2018-04-17 16:58:18 -07:00
peter klausler edd6822e00 [flang] Suppress messages in lookAhead and negated parsers.
Original-commit: flang-compiler/f18@6c00f10364
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:17 -07:00
peter klausler bdc1577188 [flang] reformat
Original-commit: flang-compiler/f18@4a4648facd
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:16 -07:00
peter klausler 984db1b650 [flang] Remove questionable swap() routines in ParseState and Messages.
Original-commit: flang-compiler/f18@9a8155ebca
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:14 -07:00
peter klausler 4a4ad8f323 [flang] Avoid a std::move() when emplacing new messages.
Original-commit: flang-compiler/f18@39c0e1fdba
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:13 -07:00
peter klausler 8aa47941ee [flang] Remove obsolete #if 0 code.
Original-commit: flang-compiler/f18@0195cd5646
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:12 -07:00
peter klausler 84ebba9e53 [flang] Avoid std::shared_ptr<> in favor of reference counting.
Original-commit: flang-compiler/f18@116c9881c9
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:11 -07:00
peter klausler f595462ea8 [flang] Message experiment: defer all message generation until non-speculative.
Original-commit: flang-compiler/f18@b6ce95ca3a
Reviewed-on: https://github.com/flang-compiler/f18/pull/59
Tree-same-pre-rewrite: false
2018-04-17 16:58:10 -07:00
Tim Keith f39d1a1486 [flang] Merge pull request flang-compiler/f18#58 from ThePortlandGroup/tsk1
Add statement functions to symbol table

Original-commit: flang-compiler/f18@c69f975aee
Reviewed-on: https://github.com/flang-compiler/f18/pull/58
2018-04-17 16:55:57 -07:00
Tim Keith b4f34ddf7d [flang] Address review comments.
Original-commit: flang-compiler/f18@f9a54f7171
Reviewed-on: https://github.com/flang-compiler/f18/pull/58
2018-04-17 15:04:08 -07:00
Tim Keith 7e34313ff7 [flang] Add statement functions to symbol table
SubprogramDetails: Store dummy args and result as symbols, not names.

Symbol: Save list of occurrences (i.e. SourceNames that map to the same
symbol). This is needed to map Names in the parse tree back to symbols,
and will probably be useful when reporting errors.
Improve dumping of symbols.

resolve-names.cc: Recognize statement functions. They are treated like
function subprograms but the result type and type of dummy arguments come
from the enclosing scope. The implicit rules from the enclosing scope need
to be copied in.

Original-commit: flang-compiler/f18@44e4fb4b6c
Reviewed-on: https://github.com/flang-compiler/f18/pull/58
Tree-same-pre-rewrite: false
2018-04-17 14:16:42 -07:00
Peter Klausler 90d476410d [flang] Merge pull request flang-compiler/f18#57 from ThePortlandGroup/pmk-bugfix
fix misrecogition of actual argument "a==b"

Original-commit: flang-compiler/f18@56ee8bf349
Reviewed-on: https://github.com/flang-compiler/f18/pull/57
2018-04-16 16:21:07 -07:00
peter klausler 2db73970bd [flang] fix misrecogition of actual argument "a==b" as keyword "a=" and value "=b"
Original-commit: flang-compiler/f18@52b1837419
Reviewed-on: https://github.com/flang-compiler/f18/pull/57
2018-04-16 15:41:37 -07:00
Peter Klausler 4692589215 [flang] Merge pull request flang-compiler/f18#56 from ThePortlandGroup/pmk-proc-component
Simplify grammar for "variable" as used in proc-component-ref and pointer ass't

Original-commit: flang-compiler/f18@3bbfe5656f
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
2018-04-16 13:52:45 -07:00
Tim Keith afe25498e3 [flang] Resolve array specifications of entities.
Add ArraySpecVisitor to recognize the various forms of array specifications.
They are tracked in arraySpec_ and attrArraySpec_. Both are needed because
a declaration like `integer, dimension(4) :: x(2,2), y` has two different
array-specs.

The method DeclareEntity was extracted out to handle the common part for
EntityDecl, ObjectDecl, and DimensionStmt. AllocatableStmt and TargetStmt
are now handled through their contained ObjectDecl.

The test resolve07 checks the interactions between these kinds of declarations.

Rename ComponentArraySpec to ArraySpec as it doesn't just occur in components.

Fix some 'begin' and 'end' methods to start with upper-case letters.

Original-commit: flang-compiler/f18@113bfc4fe7
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
2018-04-16 13:37:59 -07:00
Stephane Chauveau f45a354519 [flang] run clang-format
Original-commit: flang-compiler/f18@8639d566da
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
Tree-same-pre-rewrite: false
2018-04-16 13:37:55 -07:00
Stephane Chauveau b071d3bf0a [flang] add accessor to derived type definition
Original-commit: flang-compiler/f18@f73c70395e
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
Tree-same-pre-rewrite: false
2018-04-16 13:37:55 -07:00
Stephane Chauveau 25ec87b25c [flang] Add missing accessors in 'type' classes
Original-commit: flang-compiler/f18@7b79fcfbc5
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
Tree-same-pre-rewrite: false
2018-04-16 13:37:55 -07:00
peter klausler 058fa829fb [flang] fix misrecognition of a bounds-spec-list or bound-remapping-list in a pointer-assignment-stmt
Original-commit: flang-compiler/f18@32148441f5
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
2018-04-16 13:37:54 -07:00
peter klausler 2884b2ebbd [flang] Use DataRef as a better name for the data-ref production. Use DataRef instead of Variable for LHS of pointer assignment.
Original-commit: flang-compiler/f18@ed5aeb8e3c
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
Tree-same-pre-rewrite: false
2018-04-16 13:37:54 -07:00
peter klausler 0f418c7c8d [flang] Simplify proc-component-ref and variable parsing, do not try to support function calls via components of function results.
Original-commit: flang-compiler/f18@05886ddb80
Reviewed-on: https://github.com/flang-compiler/f18/pull/56
Tree-same-pre-rewrite: false
2018-04-16 13:37:53 -07:00
Tim Keith 2eeb202518 [flang] Merge pull request flang-compiler/f18#55 from ThePortlandGroup/tsk8
Add -fdebug-dump-parse-tree and -fdebug-resolve-names

Original-commit: flang-compiler/f18@a62dceb218
Reviewed-on: https://github.com/flang-compiler/f18/pull/55
2018-04-13 10:00:52 -07:00
Tim Keith c9d838e8a7 [flang] Add -fdebug-dump-parse-tree and -fdebug-resolve-names
"f18 -fdebug-resolve-names -fparse-only ..." is equivalent to what
test-type used to do, so the test-type executable can be eliminated.

-fdebug-dump-parse-tree does the parse-tree dumping that test-sema
does, but test-sema does more so I have left it alone.

Original-commit: flang-compiler/f18@8b3816528e
Reviewed-on: https://github.com/flang-compiler/f18/pull/55
2018-04-12 20:01:40 -07:00
Tim Keith 632855d02a [flang] Merge pull request flang-compiler/f18#54 from ThePortlandGroup/tsk6
Fix integration problem between PR flang-compiler/f18#51 and PR flang-compiler/f18#53.

Original-commit: flang-compiler/f18@1ec186ab77
Reviewed-on: https://github.com/flang-compiler/f18/pull/54
2018-04-12 14:36:43 -07:00
Tim Keith 75f95ea1b7 [flang] Fix integration problem between PR flang-compiler/f18#51 and PR flang-compiler/f18#53.
Stephane added an access that returned ComponentArraySpec and meanwhile
I renamed it to ArraySpec.

Original-commit: flang-compiler/f18@b8e47bc7a5
Reviewed-on: https://github.com/flang-compiler/f18/pull/54
2018-04-12 14:33:50 -07:00
Tim Keith 106a41ea5c [flang] Merge pull request flang-compiler/f18#53 from ThePortlandGroup/tsk6
Resolve array specifications of entities.

Original-commit: flang-compiler/f18@9abf24ab2f
Reviewed-on: https://github.com/flang-compiler/f18/pull/53
2018-04-12 14:25:50 -07:00
Tim Keith 8ca01883bc [flang] Resolve array specifications of entities.
Add ArraySpecVisitor to recognize the various forms of array specifications.
They are tracked in arraySpec_ and attrArraySpec_. Both are needed because
a declaration like `integer, dimension(4) :: x(2,2), y` has two different
array-specs.

The method DeclareEntity was extracted out to handle the common part for
EntityDecl, ObjectDecl, and DimensionStmt. AllocatableStmt and TargetStmt
are now handled through their contained ObjectDecl.

The test resolve07 checks the interactions between these kinds of declarations.

Rename ComponentArraySpec to ArraySpec as it doesn't just occur in components.

Fix some 'begin' and 'end' methods to start with upper-case letters.

Original-commit: flang-compiler/f18@3d4d7430b5
Reviewed-on: https://github.com/flang-compiler/f18/pull/53
2018-04-12 12:59:42 -07:00
Tim Keith d32620ac6d [flang] Merge pull request flang-compiler/f18#52 from ThePortlandGroup/tsk8
Improve include file sorting.

Original-commit: flang-compiler/f18@c36717a5e0
Reviewed-on: https://github.com/flang-compiler/f18/pull/52
2018-04-12 12:56:35 -07:00
Tim Keith 6c772ac40b [flang] Improve include file sorting.
Includes like "../dir/file.h" should sort after local includes.
This change fixes that and applies the new formatting.

Now the order (in reverse) is:
- system includes
- includes from llvm or clang (this is from the default IncludeCategories)
- includes of ../something
- everything else

Original-commit: flang-compiler/f18@324643d63a
Reviewed-on: https://github.com/flang-compiler/f18/pull/52
2018-04-12 12:23:20 -07:00
Stephane Chauveau 11e278b83c [flang] Merge pull request flang-compiler/f18#51 from ThePortlandGroup/sch_types
add missing accessors to types

Original-commit: flang-compiler/f18@9b54154c63
Reviewed-on: https://github.com/flang-compiler/f18/pull/51
2018-04-12 21:34:03 +02:00
Stephane Chauveau 0fc0c6bc6b [flang] run clang-format
Original-commit: flang-compiler/f18@f40a1dd9c8
Reviewed-on: https://github.com/flang-compiler/f18/pull/51
2018-04-12 21:32:44 +02:00
Stephane Chauveau ccec5dde81 [flang] add accessor to derived type definition
Original-commit: flang-compiler/f18@d971f4f1ac
Reviewed-on: https://github.com/flang-compiler/f18/pull/51
Tree-same-pre-rewrite: false
2018-04-12 17:27:55 +02:00
Stephane Chauveau af25718ecd [flang] Add missing accessors in 'type' classes
Original-commit: flang-compiler/f18@42a46f35e8
Reviewed-on: https://github.com/flang-compiler/f18/pull/51
Tree-same-pre-rewrite: false
2018-04-12 17:11:31 +02:00
Tim Keith 39d5565279 [flang] Merge pull request flang-compiler/f18#49 from ThePortlandGroup/tsk6
Continue work on name resolution.

Original-commit: flang-compiler/f18@7e271af1e5
Reviewed-on: https://github.com/flang-compiler/f18/pull/49
2018-04-11 16:17:40 -07:00
Tim Keith a9c82bd5a5 [flang] Use ENUM_CLASS macro for Scope::Kind.
Original-commit: flang-compiler/f18@3492e8d247
Reviewed-on: https://github.com/flang-compiler/f18/pull/49
2018-04-11 13:26:38 -07:00
Tim Keith af2940cfb6 [flang] Continue work on name resolution.
In Symbol and Scope, use SourceName (== parser::CharBlock) in place of
Name (== std::string) so that names in the symtab have provenance. We
may ultimately have multiple source locations associated with a symbol.

ImplicitRules: Add isImplicitNoneType and isImplicitNoneExternal flags.

MessageHandler: Add methods to emit messages associated with source
locations.

Detect conflicting declarations of symbols (e.g. as subprogram and
variable).

Handle attribute statements like ASYNCHRONOUS statement: make sure the
symbol is present and set the attribute on it. Check that these all have
a type declared by the end of the specification part if IMPLICIT NONE.

Find variables named in Variable and Expr nodes and check they have
types declared if IMPLICIT NONE. Otherwise, make sure they are in the
symtab and apply the implicit type rules at the end of the scope.

Push a scope for MainProgram nodes and add a symbol for the name if it
has one.

Rename Scope::map_type to Scope::mapType

Add tests for errors currently being detected. There is no framework for
running them yet, just source files with the expected errors in
comments.

Original-commit: flang-compiler/f18@39e6fa4169
Reviewed-on: https://github.com/flang-compiler/f18/pull/49
Tree-same-pre-rewrite: false
2018-04-11 13:13:14 -07:00
Peter Klausler 917da9145c [flang] Merge pull request flang-compiler/f18#48 from ThePortlandGroup/pmk-nag-h
Parse NAG tests (no execution)

Original-commit: flang-compiler/f18@b18347b098
Reviewed-on: https://github.com/flang-compiler/f18/pull/48
2018-04-09 16:02:54 -07:00
peter klausler 0ca0524142 [flang] Document support for CONVERT= extension.
Original-commit: flang-compiler/f18@a4674f0743
Reviewed-on: https://github.com/flang-compiler/f18/pull/48
2018-04-09 15:39:39 -07:00
peter klausler 590afc60da [flang] Add length check so that memcmp() on source does not go past the end of input and make valgrind complain.
Original-commit: flang-compiler/f18@475e9db035
Reviewed-on: https://github.com/flang-compiler/f18/pull/48
Tree-same-pre-rewrite: false
2018-04-09 15:08:38 -07:00
peter klausler 8e7c0089a4 [flang] Fix unparsing of renamed operators in USE statements.
Original-commit: flang-compiler/f18@4152b604e3
Reviewed-on: https://github.com/flang-compiler/f18/pull/48
Tree-same-pre-rewrite: false
2018-04-09 14:52:15 -07:00