summaryrefslogtreecommitdiff
path: root/flang/documentation
diff options
context:
space:
mode:
authorpeter klausler <pklausler@nvidia.com>2018-06-22 16:44:23 -0700
committerpeter klausler <pklausler@nvidia.com>2018-06-22 16:44:23 -0700
commit97f0a05235309f65b995190ac636f994191a0791 (patch)
tree927745dea4380e55e9f8fa9f732ce29918148fd9 /flang/documentation
parentcf410675cf78a3e704211fa56aea56ec0566559c (diff)
downloadllvm-97f0a05235309f65b995190ac636f994191a0791.tar.gz
[flang] Incorporate suggestions from code review.
Original-commit: flang-compiler/f18@c66bd9ab15846afcaed129764b8c958f277e071f Reviewed-on: https://github.com/flang-compiler/f18/pull/111
Diffstat (limited to 'flang/documentation')
-rw-r--r--flang/documentation/ControlFlowGraph.md14
-rw-r--r--flang/documentation/parsing.md4
2 files changed, 9 insertions, 9 deletions
diff --git a/flang/documentation/ControlFlowGraph.md b/flang/documentation/ControlFlowGraph.md
index f3f695a378b7..b551ca1b4105 100644
--- a/flang/documentation/ControlFlowGraph.md
+++ b/flang/documentation/ControlFlowGraph.md
@@ -74,15 +74,15 @@ resolved function references, constant literals, and
data designators.
Expression nodes are represented in the compiler in a type-safe manner.
-There is a general `Expression` class template that is parameterized
-over type classification (e.g., `INTEGER`, `REAL`, &c.) and, for intrinsic
-types, kind type parameter values.
-The `Expression` class template is specialized for each type classification
-with a representation the admits only the operations that are valid
-for that type.
-Operands are non-nullable storage-owning indirections to other instances
+There is a distinct class or class template for every category of
+intrinsic type, templatized over its supported kind type parameter values.
+
+Operands are storage-owning indirections to other instances
of `Expression`, instances of constant values, and to representations
of data and function references.
+These indirections are not nullable apart from the situation in which
+the operands of an expression are being removed for use elsewhere before
+the expression is destructed.
The ranks and the extents of the shapes of the results of expressions
are explicit for constant arrays and recoverable by analysis otherwise.
diff --git a/flang/documentation/parsing.md b/flang/documentation/parsing.md
index 75594e61083c..716a1e8f8774 100644
--- a/flang/documentation/parsing.md
+++ b/flang/documentation/parsing.md
@@ -75,7 +75,7 @@ source; the parser proper does not have a tokenizer. The prescanner
builds these token sequences out of source lines and supplies them
to the preprocessor, which interprets directives and expands macro
invocations. The token sequences returned by the preprocessor are then
-marshaled to constitue the cooked character stream that is the output of
+marshaled to constitute the cooked character stream that is the output of
the prescanner.
The preprocessor and prescanner can both instantiate new temporary
@@ -122,7 +122,7 @@ Messages
--------
Message texts, and snprintf-like formatting strings for constructing
messages, are instantiated in the various components of the parser with
-C++ user defined character literals tagged with `err_en_US` and `_en_US`
+C++ user defined character literals tagged with `_err_en_US` and `_en_US`
(signifying fatality and language, with the default being the dialect of
English used in the United States) so that they may be easily identified
for localization. As described above, messages are associated with