Changes in / [2873b737:6a0d1b1e]

Files:

• doc/LaTeXmacros/common.tex (modified) (3 diffs)
• src/Parser/ParseNode.h (modified) (1 diff)
• src/Parser/StatementNode.cc (modified) (1 diff)
• src/SynTree/Statement.cc (modified) (2 diffs)
• src/SynTree/Statement.h (modified) (3 diffs)

doc/LaTeXmacros/common.tex

@@ -11 +11 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon May 15 18:03:29 2017
-%% Update Count     : 302
+%% Last Modified On : Sun Jun 18 20:32:32 2017
+%% Update Count     : 319
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -36 +36 @@
 % Names used in the document.
 
-\newcommand{\CFA}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFAIcon}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 \newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name
@@ -241 +242 @@
 belowskip=3pt,
 % replace/adjust listing characters that look bad in sanserif
-literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
+literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-        {__}{\_\,\_}2 {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2
-        {___}{\_\,\_\,\_}3,
+        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
 moredelim=**[is][\color{red}]{®}{®},                                    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
 moredelim=**[is][\color{blue}]{ß}{ß},                                   % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_

src/Parser/ParseNode.h

@@ -415 +415 @@
                                 result->location = cur->location;
                                 * out++ = result;
+                        } else {
+                                assertf(false, "buildList unknown type");
                         } // if
                 } catch( SemanticError &e ) {

src/Parser/StatementNode.cc

@@ -175 +175 @@
 
 Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ) {
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( catch_stmt, branches );
+        std::list< CatchStmt * > branches;
+        buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
         CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );

src/SynTree/Statement.cc

@@ -313 +313 @@
 }
 
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &_handlers, FinallyStmt *_finallyBlock ) :
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
         Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
 }
@@ -334 +334 @@
         // handlers
         os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        for ( std::list<Statement *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
                 (*i )->print( os, indent + 4 );
 

src/SynTree/Statement.h

@@ -315 +315 @@
 class TryStmt : public Statement {
   public:
-        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &handlers, FinallyStmt *finallyBlock = 0 );
+        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
         TryStmt( const TryStmt &other );
         virtual ~TryStmt();
@@ -321 +321 @@
         CompoundStmt *get_block() const { return block; }
         void set_block( CompoundStmt *newValue ) { block = newValue; }
-        std::list<Statement *>& get_catchers() { return handlers; }
+        std::list<CatchStmt *>& get_catchers() { return handlers; }
 
         FinallyStmt *get_finally() const { return finallyBlock; }
@@ -333 +333 @@
   private:
         CompoundStmt *block;
-        std::list<Statement *> handlers;
+        std::list<CatchStmt *> handlers;
         FinallyStmt *finallyBlock;
 };