Changeset 3f0c6a5 for doc/user/user.tex

Timestamp:

Oct 28, 2016, 1:40:31 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

066d77a

Parents:

77971f6 (diff), 47a8d17 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• doc/user/user.tex (modified) (3 diffs)

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Thu Sep 29 11:50:28 2016
-%% Update Count     : 1325
+%% Last Modified On : Tue Oct 25 23:03:59 2016
+%% Update Count     : 1357
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -326 +326 @@
 \begin{description}
 \item
-\Indexc{__CFA__}\index{preprocessor variables!__CFA__@{©__CFA__©}}
-is always available during preprocessing and its value is the current major \Index{version number} of \CFA.\footnote{
+\Indexc{__CFA_MAJOR__}\index{preprocessor variables!__CFA__@{©__CFA__©}}
+is available during preprocessing and its value is the major \Index{version number} of \CFA.\footnote{
 The C preprocessor allows only integer values in a preprocessor variable so a value like ``\Version'' is not allowed.
 Hence, the need to have three variables for the major, minor and patch version number.}
@@ -333 +333 @@
 \item
 \Indexc{__CFA_MINOR__}\index{preprocessor variables!__CFA_MINOR__@{©__CFA_MINOR__©}}
-is always available during preprocessing and its value is the current minor \Index{version number} of \CFA.
+is available during preprocessing and its value is the minor \Index{version number} of \CFA.
 
 \item
 \Indexc{__CFA_PATCH__}\index{preprocessor variables!__CFA_PATCH__@©__CFA_PATCH__©}
-is always available during preprocessing and its value is the current patch \Index{version number} of \CFA.
-
-\item
+is available during preprocessing and its value is the patch \Index{level number} of \CFA.
+
+\item
+\Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©} and
 \Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©}
-is always available during preprocessing and has no value.
+are always available during preprocessing and have no value.
 \end{description}
 These preprocessor variables allow conditional compilation of programs that must work differently in these situations.