Index: .gitignore =================================================================== --- .gitignore (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ .gitignore (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -34,2 +34,7 @@ # generated by bison and lex from cfa.yy and lex.ll, respectively src/Parser/parser.output + +# generated by xfig for user manual +doc/user/Cdecl.tex +doc/user/pointer1.tex +doc/user/pointer2.tex Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ doc/LaTeXmacros/common.tex (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Tue Aug 2 17:02:02 2016 -%% Update Count : 228 +%% Last Modified On : Sun Aug 14 08:27:29 2016 +%% Update Count : 231 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -154,5 +154,5 @@ }% \newcommand{\etal}{% - \@ifnextchar{.}{\abbrevFont{et al}}% + \@ifnextchar{.}{\abbrevFont{et~al}}% {\abbrevFont{et al}.\xspace}% }% @@ -255,5 +255,5 @@ literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1 - {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {...}{$\dots$}2, + {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2, }% Index: doc/aaron_comp_II/comp_II.tex =================================================================== --- doc/aaron_comp_II/comp_II.tex (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ doc/aaron_comp_II/comp_II.tex (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -91,5 +91,5 @@ \CFA\footnote{Pronounced ``C-for-all'', and written \CFA or \CFL.} is an evolutionary modernization of the C programming language currently being designed and built at the University of Waterloo by a team led by Peter Buhr. \CFA both fixes existing design problems and adds multiple new features to C, including name overloading, user-defined operators, parametric-polymorphic routines, and type constructors and destructors, among others. -The new features make \CFA significantly more powerful and expressive than C, but impose a significant compile-time cost, particularly in the expression resolver, which must evaluate the typing rules of a much more complex type-system. +The new features make \CFA more powerful and expressive than C, but impose a compile-time cost, particularly in the expression resolver, which must evaluate the typing rules of a significantly more complex type-system. The primary goal of this research project is to develop a sufficiently performant expression resolution algorithm, experimentally validate its performance, and integrate it into CFA, the \CFA reference compiler. @@ -104,5 +104,5 @@ It is important to note that \CFA is not an object-oriented language. -\CFA does have a system of (possibly implicit) type conversions derived from C's type conversions; while these conversions may be thought of as something like an inheritance hierarchy the underlying semantics are significantly different and such an analogy is loose at best. +\CFA does have a system of (possibly implicit) type conversions derived from C's type conversions; while these conversions may be thought of as something like an inheritance hierarchy, the underlying semantics are significantly different and such an analogy is loose at best. Particularly, \CFA has no concept of ``subclass'', and thus no need to integrate an inheritance-based form of polymorphism with its parametric and overloading-based polymorphism. The graph structure of the \CFA type conversions is also markedly different than an inheritance graph; it has neither a top nor a bottom type, and does not satisfy the lattice properties typical of inheritance graphs. @@ -120,10 +120,10 @@ \end{lstlisting} The ©identity© function above can be applied to any complete object type (or ``©otype©''). -The type variable ©T© is transformed into a set of additional implicit parameters to ©identity© which encode sufficient information about ©T© to create and return a variable of that type. +The type variable ©T© is transformed into a set of additional implicit parameters to ©identity©, which encode sufficient information about ©T© to create and return a variable of that type. The current \CFA implementation passes the size and alignment of the type represented by an ©otype© parameter, as well as an assignment operator, constructor, copy constructor and destructor. Here, the runtime cost of polymorphism is spread over each polymorphic call, due to passing more arguments to polymorphic functions; preliminary experiments have shown this overhead to be similar to \CC virtual function calls. Determining if packaging all polymorphic arguments to a function into a virtual function table would reduce the runtime overhead of polymorphic calls is an open research question. -Since bare polymorphic types do not provide a great range of available operations, \CFA also provides a \emph{type assertion} mechanism to provide further information about a type: +Since bare polymorphic types do not provide a great range of available operations, \CFA provides a \emph{type assertion} mechanism to provide further information about a type: \begin{lstlisting} forall(otype T ®| { T twice(T); }®) @@ -137,5 +137,5 @@ \end{lstlisting} These type assertions may be either variable or function declarations that depend on a polymorphic type variable. -©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function is passed as an additional implicit parameter to the call to ©four_times©. +©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function is passed as an additional implicit parameter to the call of ©four_times©. Monomorphic specializations of polymorphic functions can themselves be used to satisfy type assertions. @@ -148,5 +148,5 @@ The compiler accomplishes this by creating a wrapper function calling ©twice // (2)© with ©S© bound to ©double©, then providing this wrapper function to ©four_times©\footnote{©twice // (2)© could also have had a type parameter named ©T©; \CFA specifies renaming of the type parameters, which would avoid the name conflict with the type variable ©T© of ©four_times©.}. -Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration in the current scope. +Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration \emph{in the current scope}. If a polymorphic function can be used to satisfy one of its own type assertions, this recursion may not terminate, as it is possible that function is examined as a candidate for its own type assertion unboundedly repeatedly. To avoid infinite loops, the current CFA compiler imposes a fixed limit on the possible depth of recursion, similar to that employed by most \CC compilers for template expansion; this restriction means that there are some semantically well-typed expressions that cannot be resolved by CFA. @@ -170,11 +170,10 @@ forall(otype M | has_magnitude(M)) M max_magnitude( M a, M b ) { - M aa = abs(a), ab = abs(b); - return aa < ab ? b : a; + return abs(a) < abs(b) ? b : a; } \end{lstlisting} Semantically, traits are simply a named lists of type assertions, but they may be used for many of the same purposes that interfaces in Java or abstract base classes in \CC are used for. -Unlike Java interfaces or \CC base classes, \CFA types do not explicitly state any inheritance relationship to traits they satisfy; this can be considered a form of structural inheritance, similar to interface implementation in Go, as opposed to the nominal inheritance model of Java and \CC. +Unlike Java interfaces or \CC base classes, \CFA types do not explicitly state any inheritance relationship to traits they satisfy; this can be considered a form of structural inheritance, similar to implementation of an interface in Go, as opposed to the nominal inheritance model of Java and \CC. Nominal inheritance can be simulated with traits using marker variables or functions: \begin{lstlisting} @@ -190,6 +189,6 @@ \end{lstlisting} -Traits, however, are significantly more powerful than nominal-inheritance interfaces; firstly, due to the scoping rules of the declarations which satisfy a trait's type assertions, a type may not satisfy a trait everywhere that the type is declared, as with ©char© and the ©nominal© trait above. -Secondly, traits may be used to declare a relationship between multiple types, a property which may be difficult or impossible to represent in nominal-inheritance type systems: +Traits, however, are significantly more powerful than nominal-inheritance interfaces; firstly, due to the scoping rules of the declarations that satisfy a trait's type assertions, a type may not satisfy a trait everywhere that the type is declared, as with ©char© and the ©nominal© trait above. +Secondly, traits may be used to declare a relationship among multiple types, a property that may be difficult or impossible to represent in nominal-inheritance type systems: \begin{lstlisting} trait pointer_like(®otype Ptr, otype El®) { @@ -202,5 +201,5 @@ }; -typedef list* list_iterator; +typedef list *list_iterator; lvalue int *?( list_iterator it ) { @@ -209,14 +208,15 @@ \end{lstlisting} -In the example above, ©(list_iterator, int)© satisfies ©pointer_like© by the given function, and ©(list_iterator, list)© also satisfies ©pointer_like© by the built-in pointer dereference operator. +In the example above, ©(list_iterator, int)© satisfies ©pointer_like© by the user-defined dereference function, and ©(list_iterator, list)© also satisfies ©pointer_like© by the built-in dereference operator for pointers. +Given a declaration ©list_iterator it©, ©*it© can be either an ©int© or a ©list©, with the meaning disambiguated by context (\eg ©int x = *it;© interprets ©*it© as an ©int©, while ©(*it).value = 42;© interprets ©*it© as a ©list©). While a nominal-inheritance system with associated types could model one of those two relationships by making ©El© an associated type of ©Ptr© in the ©pointer_like© implementation, few such systems could model both relationships simultaneously. -The flexibility of \CFA's implicit trait satisfaction mechanism provides programmers with a great deal of power, but also blocks some optimization approaches for expression resolution. -The ability of types to begin to or cease to satisfy traits when declarations go into or out of scope makes caching of trait satisfaction judgements difficult, and the ability of traits to take multiple type parameters could lead to a combinatorial explosion of work in any attempt to pre-compute trait satisfaction relationships. +The flexibility of \CFA's implicit trait-satisfaction mechanism provides programmers with a great deal of power, but also blocks some optimization approaches for expression resolution. +The ability of types to begin to or cease to satisfy traits when declarations go into or out of scope makes caching of trait satisfaction judgements difficult, and the ability of traits to take multiple type parameters can lead to a combinatorial explosion of work in any attempt to pre-compute trait satisfaction relationships. On the other hand, the addition of a nominal inheritance mechanism to \CFA's type system or replacement of \CFA's trait satisfaction system with a more object-oriented inheritance model and investigation of possible expression resolution optimizations for such a system may be an interesting avenue of further research. \subsection{Name Overloading} In C, no more than one variable or function in the same scope may share the same name\footnote{Technically, C has multiple separated namespaces, one holding ©struct©, ©union©, and ©enum© tags, one holding labels, one holding typedef names, variable, function, and enumerator identifiers, and one for each ©struct© or ©union© type holding the field names.}, and variable or function declarations in inner scopes with the same name as a declaration in an outer scope hide the outer declaration. -This makes finding the proper declaration to match to a variable expression or function application a simple matter of symbol table lookup, which can be easily and efficiently implemented. +This restriction makes finding the proper declaration to match to a variable expression or function application a simple matter of symbol-table lookup, which can be easily and efficiently implemented. \CFA, on the other hand, allows overloading of variable and function names, so long as the overloaded declarations do not have the same type, avoiding the multiplication of variable and function names for different types common in the C standard library, as in the following example: \begin{lstlisting} @@ -229,9 +229,9 @@ double max = DBL_MAX; // (4) -max(7, -max); // uses (1) and (3), by matching int type of 7 -max(max, 3.14); // uses (2) and (4), by matching double type of 3.14 +max(7, -max); // uses (1) and (3), by matching int type of the constant 7 +max(max, 3.14); // uses (2) and (4), by matching double type of the constant 3.14 max(max, -max); // ERROR: ambiguous -int m = max(max, -max); // uses (1) and (3) twice, by return type +int m = max(max, -max); // uses (1) once and (3) twice, by matching return type \end{lstlisting} @@ -239,12 +239,12 @@ \subsection{Implicit Conversions} -In addition to the multiple interpretations of an expression produced by name overloading, \CFA also supports all of the implicit conversions present in C, producing further candidate interpretations for expressions. -C does not have a traditionally-defined inheritance hierarchy of types, but the C standard's rules for the ``usual arithmetic conversions'' define which of the built-in types are implicitly convertable to which other types, and the relative cost of any pair of such conversions from a single source type. -\CFA adds to the usual arithmetic conversions rules for determining the cost of binding a polymorphic type variable in a function call; such bindings are cheaper than any \emph{unsafe} (narrowing) conversion, \eg ©int© to ©char©, but more expensive than any \emph{safe} (widening) conversion, \eg ©int© to ©double©. - -The expression resolution problem, then, is to find the unique minimal-cost interpretation of each expression in the program, where all identifiers must be matched to a declaration and implicit conversions or polymorphic bindings of the result of an expression may increase the cost of the expression. +In addition to the multiple interpretations of an expression produced by name overloading, \CFA must support all of the implicit conversions present in C for backward compatibility, producing further candidate interpretations for expressions. +C does not have a inheritance hierarchy of types, but the C standard's rules for the ``usual arithmetic conversions'' define which of the built-in types are implicitly convertable to which other types, and the relative cost of any pair of such conversions from a single source type. +\CFA adds to the usual arithmetic conversions rules defining the cost of binding a polymorphic type variable in a function call; such bindings are cheaper than any \emph{unsafe} (narrowing) conversion, \eg ©int© to ©char©, but more expensive than any \emph{safe} (widening) conversion, \eg ©int© to ©double©. + +The expression resolution problem, then, is to find the unique minimal-cost interpretation of each expression in the program, where all identifiers must be matched to a declaration, and implicit conversions or polymorphic bindings of the result of an expression may increase the cost of the expression. Note that which subexpression interpretation is minimal-cost may require contextual information to disambiguate. -For instance, in the example in the previous subsection, ©max(max, -max)© cannot be unambiguously resolved, but ©int m = max(max, -max);© has a single minimal-cost resolution. -©int m = (int)max((double)max, -(double)max)© is also be a valid interpretation, but is not minimal-cost due to the unsafe cast from the ©double© result of ©max© to ©int© (the two ©double© casts function as type ascriptions selecting ©double max© rather than casts from ©int max© to ©double©, and as such are zero-cost). +For instance, in the example in the previous subsection, ©max(max, -max)© cannot be unambiguously resolved, but ©int m = max(max, -max)© has a single minimal-cost resolution. +While the interpretation ©int m = (int)max((double)max, -(double)max)© is also a valid interpretation, it is not minimal-cost due to the unsafe cast from the ©double© result of ©max© to ©int© (the two ©double© casts function as type ascriptions selecting ©double max© rather than casts from ©int max© to ©double©, and as such are zero-cost). \subsubsection{User-generated Implicit Conversions} @@ -252,25 +252,26 @@ Such a conversion system should be simple for programmers to utilize, and fit naturally with the existing design of implicit conversions in C; ideally it would also be sufficiently powerful to encode C's usual arithmetic conversions itself, so that \CFA only has one set of rules for conversions. -Ditchfield~\cite{Ditchfield:conversions} has laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. +Ditchfield~\cite{Ditchfield:conversions} laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. A monomorphic variant of these functions can be used to mark a conversion arc in the DAG as only usable as the final step in a conversion. -With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented as path length through the DAG. +With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented the length of the shortest path through the DAG from one type to another. \begin{figure}[h] \centering \includegraphics{conversion_dag} -\caption{A portion of the implicit conversion DAG for built-in types.} +\caption{A portion of the implicit conversion DAG for built-in types.}\label{fig:conv_dag} \end{figure} -As can be seen in the example DAG above, there are either safe or unsafe paths between each of the arithmetic types listed; the ``final'' arcs are important both to avoid creating cycles in the signed-unsigned conversions, and to disambiguate potential diamond conversions (\eg, if the ©int© to ©unsigned int© conversion was not marked final there would be two length-two paths from ©int© to ©unsigned long©, and it would be impossible to choose which one; however, since the ©unsigned int© to ©unsigned long© arc can not be traversed after the final ©int© to ©unsigned int© arc, there is a single unambiguous conversion path from ©int© to ©unsigned long©). +As can be seen in Figure~\ref{fig:conv_dag}, there are either safe or unsafe paths between each of the arithmetic types listed; the ``final'' arcs are important both to avoid creating cycles in the signed-unsigned conversions, and to disambiguate potential diamond conversions (\eg, if the ©int© to ©unsigned int© conversion was not marked final there would be two length-two paths from ©int© to ©unsigned long©, making it impossible to choose which one; however, since the ©unsigned int© to ©unsigned long© arc can not be traversed after the final ©int© to ©unsigned int© arc, there is a single unambiguous conversion path from ©int© to ©unsigned long©). Open research questions on this topic include: \begin{itemize} \item Can a conversion graph be generated that represents each allowable conversion in C with a unique minimal-length path such that the path lengths accurately represent the relative costs of the conversions? -\item Can such a graph representation can be usefully augmented to include user-defined types as well as built-in types? -\item Can the graph can be efficiently represented and used in the expression resolver? +\item Can such a graph representation be usefully augmented to include user-defined types as well as built-in types? +\item Can the graph be efficiently represented and used in the expression resolver? \end{itemize} \subsection{Constructors and Destructors} Rob Shluntz, a current member of the \CFA research team, has added constructors and destructors to \CFA. -Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor; for ©struct© types these functions each call their equivalents on each field of the ©struct©. -This affects expression resolution because an ©otype© type variable ©T© implicitly adds four type assertions, one for each of these four functions, so assertion resolution is pervasive in \CFA polymorphic functions, even those without any explicit type assertions. +Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor. +For ©struct© types these functions each call their equivalents on each field of the ©struct©. +This feature affects expression resolution because an ©otype© type variable ©T© implicitly adds four type assertions, one for each of these four functions, so assertion resolution is pervasive in \CFA polymorphic functions, even those without any explicit type assertions. The following example shows the implicitly-generated code in green: \begin{lstlisting} @@ -280,20 +281,20 @@ }; -¢void ?{}(kv *this) { - ?{}(&this->key); - ?{}(&this->value); -} -void ?{}(kv *this, kv that) { - ?{}(&this->key, that.key); - ?{}(&this->value, that.value); -} -kv ?=?(kv *this, kv that) { - ?=?(&this->key, that.key); - ?=?(&this->value, that.value); +¢void ?{}(kv *this) { // default constructor + ?{}(&(this->key)); // call recursively on members + ?{}(&(this->value)); +} +void ?{}(kv *this, kv that) { // copy constructor + ?{}(&(this->key), that.key); + ?{}(&(this->value), that.value); +} +kv ?=?(kv *this, kv that) { // assignment operator + ?=?(&(this->key), that.key); + ?=?(&(this->value), that.value); return *this; } -void ^?{}(kv *this) { - ^?{}(&this->key); - ^?{}(&this->value); +void ^?{}(kv *this) { // destructor + ^?{}(&(this->key)); + ^?{}(&(this->value)); }¢ @@ -335,9 +336,10 @@ \begin{itemize} \item Since there is an implicit conversion from ©void*© to any pointer type, the highlighted expression can be interpreted as either a ©void*©, matching ©f // (1)©, or a ©box(S)*© for some type ©S©, matching ©f // (2)©. -\item To determine the cost of the ©box(S)© interpretation, a type must be found for ©S© which satisfies the ©otype© implicit type assertions (assignment operator, default and copy constructors, and destructor); one option is ©box(S2)© for some type ©S2©. +\item To determine the cost of the ©box(S)© interpretation, a type must be found for ©S© that satisfies the ©otype© implicit type assertions (assignment operator, default and copy constructors, and destructor); one option is ©box(S2)© for some type ©S2©. \item The assignment operator, default and copy constructors, and destructor of ©box(T)© are also polymorphic functions, each of which require the type parameter ©T© to have an assignment operator, default and copy constructors, and destructor. When choosing an interpretation for ©S2©, one option is ©box(S3)©, for some type ©S3©. \item The previous step repeats until stopped, with four times as much work performed at each step. \end{itemize} -This problem can occur in any resolution context where a polymorphic function that can satisfy its own type assertions is required for a possible interpretation of an expression with no constraints on its type, and is thus not limited to combinations of generic types with ©void*© conversions, though constructors for generic types often satisfy their own assertions and a polymorphic conversion such as the ©void*© conversion to a polymorphic variable can create an expression with no constraints on its type. +This problem can occur in any resolution context where a polymorphic function can satisfy its own type assertions is required for a possible interpretation of an expression with no constraints on its type, and is thus not limited to combinations of generic types with ©void*© conversions. +However, constructors for generic types often satisfy their own assertions and a polymorphic conversion such as the ©void*© conversion to a polymorphic variable is a common way to create an expression with no constraints on its type. As discussed above, the \CFA expression resolver must handle this possible infinite recursion somehow, and it occurs fairly naturally in code like the above that uses generic types. @@ -345,21 +347,28 @@ \CFA adds \emph{tuple types} to C, a syntactic facility for referring to lists of values anonymously or with a single identifier. An identifier may name a tuple, and a function may return one. -Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap© below: -\begin{lstlisting} -[char, char] x = [ '!', '?' ]; -int x = 42; - -forall(otype T) [T, T] swap( T a, T b ) { return [b, a]; } +Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap©: +\begin{lstlisting} +[char, char] x = [ '!', '?' ]; // (1) +int x = 42; // (2) + +forall(otype T) [T, T] swap( T a, T b ) { return [b, a]; } // (3) x = swap( x ); // destructure [char, char] x into two elements of parameter list // cannot use int x for parameter, not enough arguments to swap -\end{lstlisting} -Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above. + +void swap( int, char, char ); // (4) + +swap( x, x ); // resolved as (4) on (2) and (1) +// (3) on (2) and (2) is close, but the polymorphic binding makes it not minimal-cost +\end{lstlisting} +Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above. +In the second example, the second ©x© argument can be resolved starting at the second or third parameter of ©swap©, depending which interpretation of ©x© was chosen for the first argument. \subsection{Reference Types} I have been designing \emph{reference types} for \CFA, in collaboration with the rest of the \CFA research team. Given some type ©T©, a ©T&© (``reference to ©T©'') is essentially an automatically dereferenced pointer; with these semantics most of the C standard's discussions of lvalues can be expressed in terms of references instead, with the benefit of being able to express the difference between the reference and non-reference version of a type in user code. -References preserve C's existing qualifier-dropping lvalue-to-rvalue conversion (\eg a ©const volatile int&© can be implicitly converted to a bare ©int©); the reference proposal also adds a rvalue-to-lvalue conversion to \CFA, implemented by storing the value in a new compiler-generated temporary and passing a reference to the temporary. -These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary, as below: +References preserve C's existing qualifier-dropping lvalue-to-rvalue conversion (\eg a ©const volatile int&© can be implicitly converted to a bare ©int©). +The reference proposal also adds a rvalue-to-lvalue conversion to \CFA, implemented by storing the value in a new compiler-generated temporary and passing a reference to the temporary. +These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary, as in: \begin{lstlisting} const int magic = 42; @@ -369,13 +378,13 @@ print_inc( magic ); // legal; implicitly generated code in green below: -¢int tmp = magic;¢ // copies to safely strip const-qualifier +¢int tmp = magic;¢ // to safely strip const-qualifier ¢print_inc( tmp );¢ // tmp is incremented, magic is unchanged \end{lstlisting} -These reference conversions may also chain with the other implicit type conversions. -The main implication of this for expression resolution is the multiplication of available implicit conversions, though in a restricted context that may be able to be treated efficiently as a special case. +These reference conversions may also chain with the other implicit type-conversions. +The main implication of the reference conversions for expression resolution is the multiplication of available implicit conversions, though given the restricted context reference conversions may be able to be treated efficiently as a special case of implicit conversions. \subsection{Special Literal Types} Another proposal currently under consideration for the \CFA type-system is assigning special types to the literal values ©0© and ©1©. -Implicit conversions from these types allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precicely. +Implicit conversions from these types allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precisely. This approach is a generalization of C's existing behaviour of treating ©0© as either an integer zero or a null pointer constant, and treating either of those values as boolean false. The main implication for expression resolution is that the frequently encountered expressions ©0© and ©1© may have a large number of valid interpretations. @@ -386,6 +395,6 @@ int somefn(char) = delete; \end{lstlisting} -This feature is typically used in \CCeleven to make a type non-copyable by deleting its copy constructor and assignment operator, or forbidding some interpretations of a polymorphic function by specifically deleting the forbidden overloads. -To add a similar feature to \CFA would involve including the deleted function declarations in expression resolution along with the normal declarations, but producing a compiler error if the deleted function was the best resolution. +This feature is typically used in \CCeleven to make a type non-copyable by deleting its copy constructor and assignment operator\footnote{In previous versions of \CC a type could be made non-copyable by declaring a private copy constructor and assignment operator, but not defining either. This idiom is well-known, but depends on some rather subtle and \CC-specific rules about private members and implicitly-generated functions; the deleted-function form is both clearer and less verbose.}, or forbidding some interpretations of a polymorphic function by specifically deleting the forbidden overloads\footnote{Specific polymorphic function overloads can also be forbidden in previous \CC versions through use of template metaprogramming techniques, though this advanced usage is beyond the skills of many programmers. A similar effect can be produced on an ad-hoc basis at the appropriate call sites through use of casts to determine the function type. In both cases, the deleted-function form is clearer and more concise.}. +To add a similar feature to \CFA involves including the deleted function declarations in expression resolution along with the normal declarations, but producing a compiler error if the deleted function is the best resolution. How conflicts should be handled between resolution of an expression to both a deleted and a non-deleted function is a small but open research question. @@ -404,5 +413,5 @@ %TODO: look up and lit review The second area of investigation is minimizing dependencies between argument-parameter matches; the current CFA compiler attempts to match entire argument combinations against functions at once, potentially attempting to match the same argument against the same parameter multiple times. -Whether the feature set of \CFA admits an expression resolution algorithm where arguments can be matched to parameters independently of other arguments in the same function application is an area of open research; polymorphic type paramters produce enough of a cross-argument dependency that the problem is not trivial. +Whether the feature set of \CFA admits an expression resolution algorithm where arguments can be matched to parameters independently of other arguments in the same function application is an area of open research; polymorphic type paramters produce enough cross-argument dependencies that the problem is not trivial. If cross-argument resolution dependencies cannot be completely eliminated, effective caching strategies to reduce duplicated work between equivalent argument-parameter matches in different combinations may mitigate the asymptotic defecits of the whole-combination matching approach. The final area of investigation is heuristics and algorithmic approaches to reduce the number of argument interpretations considered in the common case; if argument-parameter matches cannot be made independent, even small reductions in $i$ should yield significant reductions in the $i^{p+1}$ resolver runtime factor. @@ -412,7 +421,7 @@ \subsection{Argument-Parameter Matching} -The first axis for consideration is argument-parameter matching direction --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. +The first axis for consideration is the argument-parameter matching direction --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. For programming languages without implicit conversions, argument-parameter matching is essentially the entirety of the expression resolution problem, and is generally referred to as ``overload resolution'' in the literature. -All expression resolution algorithms form a DAG of interpretations, some explicitly, some implicitly; in this DAG, arcs point from function-call interpretations to argument interpretations, as below: +All expression-resolution algorithms form a DAG of interpretations, some explicitly, some implicitly; in this DAG, arcs point from function-call interpretations to argument interpretations, as in Figure~\ref{fig:res_dag}: \begin{figure}[h] \centering @@ -433,5 +442,5 @@ \end{figure} -Note that some interpretations may be part of more than one super-interpretation, as with $p_i$ in the bottom row, while some valid subexpression interpretations, like $f_d$ in the middle row, are not used in any interpretation of their containing expression. +Note that some interpretations may be part of more than one super-interpretation, as with the second $p_i$ in the bottom row, while some valid subexpression interpretations, like $f_d$ in the middle row, are not used in any interpretation of their superexpression. \subsubsection{Argument-directed (Bottom-up)} @@ -451,5 +460,5 @@ A reasonable hybrid approach might take a top-down approach when the expression to be matched has a fixed type, and a bottom-up approach in untyped contexts. This approach may involve switching from one type to another at different levels of the expression tree. -For instance: +For instance, in: \begin{lstlisting} forall(otype T) @@ -460,11 +469,12 @@ int x = f( f( '!' ) ); \end{lstlisting} -The outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach is used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x©, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner call to ©f©. The leaf expression ©'!'©, however, determines a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©. - -Deciding when to switch between bottom-up and top-down resolution to minimize wasted work in a hybrid algorithm is a necessarily heuristic process, and though finding good heuristics for which subexpressions to swich matching strategies on is an open question, one reasonable approach might be to set a threshold $t$ for the number of candidate functions, and to use top-down resolution for any subexpression with fewer than $t$ candidate functions, to minimize the number of unmatchable argument interpretations computed, but to use bottom-up resolution for any subexpression with at least $t$ candidate functions, to reduce duplication in argument interpretation computation between the different candidate functions. +the outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach is used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x©, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner call to ©f©. The leaf expression ©'!'©, however, determines a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©. + +Deciding when to switch between bottom-up and top-down resolution to minimize wasted work in a hybrid algorithm is a necessarily heuristic process, and finding good heuristics for which subexpressions to swich matching strategies on is an open question. +One reasonable approach might be to set a threshold $t$ for the number of candidate functions, and to use top-down resolution for any subexpression with fewer than $t$ candidate functions, to minimize the number of unmatchable argument interpretations computed, but to use bottom-up resolution for any subexpression with at least $t$ candidate functions, to reduce duplication in argument interpretation computation between the different candidate functions. Ganzinger and Ripken~\cite{Ganzinger80} propose an approach (later refined by Pennello~\etal~\cite{Pennello80}) that uses a top-down filtering pass followed by a bottom-up filtering pass to reduce the number of candidate interpretations; they prove that for the Ada programming language a small number of such iterations is sufficient to converge to a solution for the expression resolution problem. Persch~\etal~\cite{PW:overload} developed a similar two-pass approach where the bottom-up pass is followed by the top-down pass. -These algorithms differ from the hybrid approach under investigation in that they take multiple passes over the expression tree to yield a solution, and also in that they apply both filtering heuristics to all expression nodes; \CFA's polymorphic functions and implicit conversions make the approach of filtering out invalid types taken by all of these algorithms infeasible. +These algorithms differ from the hybrid approach under investigation in that they take multiple passes over the expression tree to yield a solution, and that they also apply both filtering heuristics to all expression nodes; \CFA's polymorphic functions and implicit conversions make the approach of filtering out invalid types taken by all of these algorithms infeasible. \subsubsection{Common Subexpression Caching} @@ -480,5 +490,5 @@ \CC~\cite{ANSI98:C++} includes both name overloading and implicit conversions in its expression resolution specification, though unlike \CFA it does complete type-checking on a generated monomorphization of template functions, where \CFA simply checks a list of type constraints. The upcoming Concepts standard~\cite{C++concepts} defines a system of type constraints similar in principle to \CFA's. -Cormack and Wright~\cite{Cormack90} present an algorithm which integrates overload resolution with a polymorphic type inference approach very similar to \CFA's. +Cormack and Wright~\cite{Cormack90} present an algorithm that integrates overload resolution with a polymorphic type inference approach very similar to \CFA's. However, their algorithm does not account for implicit conversions other than polymorphic type binding and their discussion of their overload resolution algorithm is not sufficiently detailed to classify it with the other argument-parameter matching approaches\footnote{Their overload resolution algorithm is possibly a variant of Ganzinger and Ripken~\cite{Ganzinger80} or Pennello~\etal~\cite{Pennello80}, modified to allow for polymorphic type binding.}. @@ -486,18 +496,16 @@ Bilson does account for implicit conversions in his algorithm, but it is unclear if the approach is optimal. His algorithm integrates checking for valid implicit conversions into the argument-parameter-matching step, essentially trading more expensive matching for a smaller number of argument interpretations. -This approach may result in the same subexpression being checked for a type match with the same type multiple times, though again memoization may mitigate this cost, and this approach does not generate implicit conversions that are not useful to match the containing function. -Calculating implicit conversions on parameters pairs naturally with a top-down approach to expression resolution, though it can also be used in a bottom-up approach, as Bilson demonstrates. +This approach may result in the same subexpression being checked for a type match with the same type multiple times, though again memoization may mitigate this cost; however, this approach does not generate implicit conversions that are not useful to match the containing function. \subsubsection{On Arguments} Another approach is to generate a set of possible implicit conversions for each set of interpretations of a given argument. This approach has the benefit of detecting ambiguous interpretations of arguments at the level of the argument rather than its containing call, never finds more than one interpretation of the argument with a given type, and re-uses calculation of implicit conversions between function candidates. -On the other hand, this approach may unncessarily generate argument interpretations that never match any parameter, wasting work. -Further, in the presence of tuple types this approach may lead to a combinatorial explosion of argument interpretations considered, unless the tuple can be considered as a sequence of elements rather than a unified whole. -Calculating implicit conversions on arguments is a viable approach for bottom-up expression resolution, though it may be difficult to apply in a top-down approach due to the presence of a target type for the expression interpretation. +On the other hand, this approach may unnecessarily generate argument interpretations that never match any parameter, wasting work. +Furthermore, in the presence of tuple types, this approach may lead to a combinatorial explosion of argument interpretations considered, unless the tuple can be considered as a sequence of elements rather than a unified whole. \subsection{Candidate Set Generation} -All the algorithms discussed to this point generate the complete set of candidate argument interpretations before attempting to match the containing function call expression. -However, given that the top-level expression interpretation that is ultimately chosen is the minimal-cost valid interpretation, any consideration of non-minimal-cost interpretations is in some sense wasted work. -Under the assumption that that programmers generally write function calls with relatively low-cost interpretations, a possible work-saving heuristic is to generate only the lowest-cost argument interpretations first, attempt to find a valid top-level interpretation using them, and only if that fails generate the next higher-cost argument interpretations. +All the algorithms discussed to this point generate the complete set of candidate argument interpretations before attempting to match the containing function-call expression. +However, given that the top-level expression interpretation that is ultimately chosen is the minimal-cost valid interpretation, any consideration of non-minimal-cost interpretations is wasted work. +Under the assumption that programmers generally write function calls with relatively low-cost interpretations, a possible work-saving heuristic is to generate only the lowest-cost argument interpretations first, attempt to find a valid top-level interpretation using them, and only if that fails generate the next higher-cost argument interpretations. \subsubsection{Eager} @@ -563,5 +571,5 @@ This comparison closes Baker's open research question, as well as potentially improving Bilson's \CFA compiler. -Rather than testing all of these algorithms in-place in the \CFA compiler, a resolver prototype is being developed which acts on a simplified input language encapsulating the essential details of the \CFA type-system\footnote{Note this simplified input language is not a usable programming language.}. +Rather than testing all of these algorithms in-place in the \CFA compiler, a resolver prototype is being developed that acts on a simplified input language encapsulating the essential details of the \CFA type-system\footnote{Note this simplified input language is not a usable programming language.}. Multiple variants of this resolver prototype will be implemented, each encapsulating a different expression resolution variant, sharing as much code as feasible. These variants will be instrumented to test runtime performance, and run on a variety of input files; the input files may be generated programmatically or from exisiting code in \CFA or similar languages. @@ -571,5 +579,5 @@ As an example, there are currently multiple open proposals for how implicit conversions should interact with polymorphic type binding in \CFA, each with distinct levels of expressive power; if the resolver prototype is modified to support each proposal, the optimal algorithm for each proposal can be compared, providing an empirical demonstration of the trade-off between expressive power and compiler runtime. -This proposed project should provide valuable data on how to implement a performant compiler for modern programming languages such as \CFA with powerful static type-systems, specifically targeting the feature interaction between name overloading and implicit conversions. +This proposed project should provide valuable data on how to implement a performant compiler for programming languages such as \CFA with powerful static type-systems, specifically targeting the feature interaction between name overloading and implicit conversions. This work is not limited in applicability to \CFA, but may also be useful for supporting efficient compilation of the upcoming Concepts standard~\cite{C++concepts} for \CC template constraints, for instance. Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ doc/user/user.tex (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Tue Aug 2 17:39:02 2016 -%% Update Count : 1286 +%% Last Modified On : Sun Aug 14 08:23:06 2016 +%% Update Count : 1323 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -317,5 +317,5 @@ \item -\Indexc{-no-include-std}\index{compilation option!-no-include-std@©-no-include-std©} +\Indexc{-no-include-stdhdr}\index{compilation option!-no-include-stdhdr@©-no-include-stdhdr©} Do not supply ©extern "C"© wrappers for \Celeven standard include files (see~\VRef{s:StandardHeaders}). \textbf{This option is \emph{not} the default.} @@ -807,4 +807,30 @@ +\section{Backquote Identifiers} +\label{s:BackquoteIdentifiers} + +\CFA accommodates keyword clashes by syntactic transformations using the \CFA backquote escape-mechanism: +\begin{lstlisting} +int `otype` = 3; // make keyword an identifier +double `choose` = 3.5; +\end{lstlisting} +Programs can be converted easily by enclosing keyword identifiers in backquotes, and the backquotes can be removed later when the identifier name is changed to an non-keyword name. +Clashes in C header files (see~\VRef{s:StandardHeaders}) can be handled automatically using the preprocessor, ©#include_next© and ©-I filename©: +\begin{lstlisting} +// include file uses the CFA keyword "otype". +#if ! defined( otype ) // nesting ? +#define otype `otype` +#define __CFA_BFD_H__ +#endif // ! otype + +#include_next // must have internal check for multiple expansion + +#if defined( otype ) && defined( __CFA_BFD_H__ ) // reset only if set +#undef otype +#undef __CFA_BFD_H__ +#endif // otype && __CFA_BFD_H__ +\end{lstlisting} + + \section{Type Operators} @@ -1011,5 +1037,22 @@ Alternatively, prototype definitions can be eliminated by using a two-pass compilation, and implicitly creating header files for exports. The former is easy to do, while the latter is more complex. -Currently, \CFA does \emph{not} attempt to support named arguments. + +Furthermore, named arguments do not work well in a \CFA-style programming-languages because they potentially introduces a new criteria for type matching. +For example, it is technically possible to disambiguate between these two overloaded definitions of ©f© based on named arguments at the call site: +\begin{lstlisting} +int f( int i, int j ); +int f( int x, double y ); + +f( j : 3, i : 4 ); §\C{// 1st f}§ +f( x : 7, y : 8.1 ); §\C{// 2nd f}§ +f( 4, 5 ); §\C{// ambiguous call}§ +\end{lstlisting} +However, named arguments compound routine resolution in conjunction with conversions: +\begin{lstlisting} +f( i : 3, 5.7 ); §\C{// ambiguous call ?}§ +\end{lstlisting} +Depending on the cost associated with named arguments, this call could be resolvable or ambiguous. +Adding named argument into the routine resolution algorithm does not seem worth the complexity. +Therefore, \CFA does \emph{not} attempt to support named arguments. \item[Default Arguments] @@ -1021,16 +1064,16 @@ the allowable positional calls are: \begin{lstlisting} -p(); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§ -p( 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§ -p( 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§ -p( 4, 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§ +p(); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§ +p( 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§ +p( 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§ +p( 4, 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 4 )}§ // empty arguments -p( , 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§ -p( 4, , 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§ -p( 4, 4, ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§ -p( 4, , ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§ -p( , 4, ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§ -p( , , 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§ -p( , , ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§ +p( , 4, 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 4 )}§ +p( 4, , 4 ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 4 )}§ +p( 4, 4, ); §\C{// rewrite $\Rightarrow$ p( 4, 4, 3 )}§ +p( 4, , ); §\C{// rewrite $\Rightarrow$ p( 4, 2, 3 )}§ +p( , 4, ); §\C{// rewrite $\Rightarrow$ p( 1, 4, 3 )}§ +p( , , 4 ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 4 )}§ +p( , , ); §\C{// rewrite $\Rightarrow$ p( 1, 2, 3 )}§ \end{lstlisting} Here the missing arguments are inserted from the default values in the parameter list. @@ -1067,12 +1110,12 @@ The conflict occurs because both named and ellipse arguments must appear after positional arguments, giving two possibilities: \begin{lstlisting} -p( /* positional */, . . ., /* named */ ); -p( /* positional */, /* named */, . . . ); +p( /* positional */, ... , /* named */ ); +p( /* positional */, /* named */, ... ); \end{lstlisting} While it is possible to implement both approaches, the first possibly is more complex than the second, \eg: \begin{lstlisting} -p( int x, int y, int z, . . . ); -p( 1, 4, 5, 6, z : 3, y : 2 ); §\C{// assume p( /* positional */, . . ., /* named */ );}§ -p( 1, z : 3, y : 2, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, . . . );}§ +p( int x, int y, int z, ... ); +p( 1, 4, 5, 6, z : 3, y : 2 ); §\C{// assume p( /* positional */, ... , /* named */ );}§ +p( 1, z : 3, y : 2, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, ... );}§ \end{lstlisting} In the first call, it is necessary for the programmer to conceptually rewrite the call, changing named arguments into positional, before knowing where the ellipse arguments begin. @@ -1082,7 +1125,7 @@ The problem is exacerbated with default arguments, \eg: \begin{lstlisting} -void p( int x, int y = 2, int z = 3. . . ); -p( 1, 4, 5, 6, z : 3 ); §\C{// assume p( /* positional */, . . ., /* named */ );}§ -p( 1, z : 3, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, . . . );}§ +void p( int x, int y = 2, int z = 3... ); +p( 1, 4, 5, 6, z : 3 ); §\C{// assume p( /* positional */, ... , /* named */ );}§ +p( 1, z : 3, 4, 5, 6 ); §\C{// assume p( /* positional */, /* named */, ... );}§ \end{lstlisting} The first call is an error because arguments 4 and 5 are actually positional not ellipse arguments; @@ -1129,6 +1172,7 @@ \subsection{Type Nesting} -\CFA allows \Index{type nesting}, and type qualification of the nested types (see \VRef[Figure]{f:TypeNestingQualification}), where as C hoists\index{type hoisting} (refactors) nested types into the enclosing scope and has no type qualification. +\CFA allows \Index{type nesting}, and type qualification of the nested typres (see \VRef[Figure]{f:TypeNestingQualification}), where as C hoists\index{type hoisting} (refactors) nested types into the enclosing scope and has no type qualification. \begin{figure} +\centering \begin{tabular}{@{}l@{\hspace{3em}}l|l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{C Type Nesting}} & \multicolumn{1}{c}{\textbf{C Implicit Hoisting}} & \multicolumn{1}{|c}{\textbf{\CFA}} \\ @@ -1397,5 +1441,5 @@ Mass assignment has the following form: \begin{lstlisting} -[ §\emph{lvalue}§, ..., §\emph{lvalue}§ ] = §\emph{expr}§; +[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = §\emph{expr}§; \end{lstlisting} \index{lvalue} @@ -1437,5 +1481,5 @@ Multiple assignment has the following form: \begin{lstlisting} -[ §\emph{lvalue}§, . . ., §\emph{lvalue}§ ] = [ §\emph{expr}§, . . ., §\emph{expr}§ ]; +[ §\emph{lvalue}§, ... , §\emph{lvalue}§ ] = [ §\emph{expr}§, ... , §\emph{expr}§ ]; \end{lstlisting} \index{lvalue} @@ -1873,7 +1917,7 @@ \begin{lstlisting} switch ( i ) { - ®case 1, 3, 5®: + case ®1, 3, 5®: ... - ®case 2, 4, 6®: + case ®2, 4, 6®: ... } @@ -1906,7 +1950,7 @@ \begin{lstlisting} switch ( i ) { - ®case 1~5:® + case ®1~5:® ... - ®case 10~15:® + case ®10~15:® ... } @@ -1915,7 +1959,7 @@ \begin{lstlisting} switch ( i ) - case 1 ... 5: + case ®1 ... 5®: ... - case 10 ... 15: + case ®10 ... 15®: ... } @@ -4369,23 +4413,151 @@ +\section{Incompatible} + +The following incompatibles exist between \CFA and C, and are similar to Annex C for \CC~\cite{ANSI14:C++}. + +\begin{enumerate} +\item +\begin{description} +\item[Change:] add new keywords \\ +New keywords are added to \CFA (see~\VRef{s:NewKeywords}). +\item[Rationale:] keywords added to implement new semantics of \CFA. +\item[Effect on original feature:] change to semantics of well-defined feature. \\ +Any ISO C programs using these keywords as identifiers are invalid \CFA programs. +\item[Difficulty of converting:] keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism (see~\VRef{s:BackquoteIdentifiers}): +\item[How widely used:] clashes among new \CFA keywords and existing identifiers are rare. +\end{description} + +\item +\begin{description} +\item[Change:] type of character literal ©int© to ©char© to allow more intuitive overloading: +\begin{lstlisting} +int rtn( int i ); +int rtn( char c ); +rtn( 'x' ); §\C{// programmer expects 2nd rtn to be called}§ +\end{lstlisting} +\item[Rationale:] it is more intuitive for the call to ©rtn© to match the second version of definition of ©rtn© rather than the first. +In particular, output of ©char© variable now print a character rather than the decimal ASCII value of the character. +\begin{lstlisting} +sout | 'x' | " " | (int)'x' | endl; +x 120 +\end{lstlisting} +Having to cast ©'x'© to ©char© is non-intuitive. +\item[Effect on original feature:] change to semantics of well-defined feature that depend on: +\begin{lstlisting} +sizeof( 'x' ) == sizeof( int ) +\end{lstlisting} +no long work the same in \CFA programs. +\item[Difficulty of converting:] simple +\item[How widely used:] programs that depend upon ©sizeof( 'x' )© are rare and can be changed to ©sizeof(char)©. +\end{description} + +\item +\begin{description} +\item[Change:] make string literals ©const©: +\begin{lstlisting} +char * p = "abc"; §\C{// valid in C, deprecated in \CFA}§ +char * q = expr ? "abc" : "de"; §\C{// valid in C, invalid in \CFA}§ +\end{lstlisting} +The type of a string literal is changed from ©[] char© to ©const [] char©. +Similarly, the type of a wide string literal is changed from ©[] wchar_t© to ©const [] wchar_t©. +\item[Rationale:] This change is a safety issue: +\begin{lstlisting} +char * p = "abc"; +p[0] = 'w'; §\C{// segment fault or change constant literal}§ +\end{lstlisting} +The same problem occurs when passing a string literal to a routine that changes its argument. +\item[Effect on original feature:] change to semantics of well-defined feature. +\item[Difficulty of converting:] simple syntactic transformation, because string literals can be converted to ©char *©. +\item[How widely used:] programs that have a legitimate reason to treat string literals as pointers to potentially modifiable memory are rare. +\end{description} + +\item +\begin{description} +\item[Change:] remove \newterm{tentative definitions}, which only occurs at file scope: +\begin{lstlisting} +int i; §\C{// forward definition}§ +int *j = ®&i®; §\C{// forward reference, valid in C, invalid in \CFA}§ +int i = 0; §\C{// definition}§ +\end{lstlisting} +is valid in C, and invalid in \CFA because duplicate overloaded object definitions at the same scope level are disallowed. +This change makes it impossible to define mutually referential file-local static objects, if initializers are restricted to the syntactic forms of C. For example, +\begin{lstlisting} +struct X { int i; struct X *next; }; +static struct X a; §\C{// forward definition}§ +static struct X b = { 0, ®&a® }; §\C{// forward reference, valid in C, invalid in \CFA}§ +static struct X a = { 1, &b }; §\C{// definition}§ +\end{lstlisting} +\item[Rationale:] avoids having different initialization rules for builtin types and userdefined types. +\item[Effect on original feature:] change to semantics of well-defined feature. +\item[Difficulty of converting:] the initializer for one of a set of mutually-referential file-local static objects must invoke a routine call to achieve the initialization. +\item[How widely used:] seldom +\end{description} + +\item +\begin{description} +\item[Change:] have ©struct© introduce a scope for nested types: +\begin{lstlisting} +enum ®Colour® { R, G, B, Y, C, M }; +struct Person { + enum ®Colour® { R, G, B }; §\C{// nested type}§ + struct Face { §\C{// nested type}§ + ®Colour® Eyes, Hair; §\C{// type defined outside (1 level)}§ + }; + ß.ß®Colour® shirt; §\C{// type defined outside (top level)}§ + ®Colour® pants; §\C{// type defined same level}§ + Face looks[10]; §\C{// type defined same level}§ +}; +®Colour® c = R; §\C{// type/enum defined same level}§ +Personß.ß®Colour® pc = Personß.ßR; §\C{// type/enum defined inside}§ +Personß.ßFace pretty; §\C{// type defined inside}§ +\end{lstlisting} +In C, the name of the nested types belongs to the same scope as the name of the outermost enclosing structure, i.e., the nested types are hoisted to the scope of the outer-most type, which is not useful and confusing. +\CFA is C \emph{incompatible} on this issue, and provides semantics similar to \Index*[C++]{\CC}. +Nested types are not hoisted and can be referenced using the field selection operator ``©.©'', unlike the \CC scope-resolution operator ``©::©''. +\item[Rationale:] ©struct© scope is crucial to \CFA as an information structuring and hiding mechanism. +\item[Effect on original feature:] change to semantics of well-defined feature. +\item[Difficulty of converting:] Semantic transformation. +\item[How widely used:] C programs rarely have nest types because they are equivalent to the hoisted version. +\end{description} + +\item +\begin{description} +\item[Change:] In C++, the name of a nested class is local to its enclosing class. +\item[Rationale:] C++ classes have member functions which require that classes establish scopes. +\item[Difficulty of converting:] Semantic transformation. To make the struct type name visible in the scope of the enclosing struct, the struct tag could be declared in the scope of the enclosing struct, before the enclosing struct is defined. Example: +\begin{lstlisting} +struct Y; §\C{// struct Y and struct X are at the same scope}§ +struct X { +struct Y { /* ... */ } y; +}; +\end{lstlisting} +All the definitions of C struct types enclosed in other struct definitions and accessed outside the scope of the enclosing struct could be exported to the scope of the enclosing struct. +Note: this is a consequence of the difference in scope rules, which is documented in 3.3. +\item[How widely used:] Seldom. +\end{description} + +\item +\begin{description} +\item[Change:] comma expression is disallowed as subscript +\item[Rationale:] safety issue to prevent subscripting error for multidimensional arrays: ©x[i,j]© instead of ©x[i][j]©, and this syntactic form then taken by \CFA for new style arrays. +\item[Effect on original feature:] change to semantics of well-defined feature. +\item[Difficulty of converting:] semantic transformation of ©x[i,j]© to ©x[(i,j)]© +\item[How widely used:] seldom. +\end{description} +\end{enumerate} + + \section{New Keywords} \label{s:NewKeywords} \begin{quote2} -\begin{tabular}{ll} -©catch© & ©lvalue© \\ -©catchResume© & \\ -©choose© & ©otype© \\ - & \\ -©disable© & ©throw© \\ -©dtype© & ©throwResume© \\ - & ©trait© \\ -©enable© & ©try© \\ - & \\ -©fallthrough© \\ -©fallthru© \\ -©finally© \\ -©forall© \\ -©ftype© \\ +\begin{tabular}{lll} +©catch© & ©fallthrough© & ©otype© \\ +©catchResume© & ©fallthru© & ©throw© \\ +©choose© & ©finally© & ©throwResume© \\ +©disable© & ©forall© & ©trait© \\ +©dtype© & ©ftype© & ©try© \\ +©enable© & ©lvalue© & \\ \end{tabular} \end{quote2} @@ -4395,5 +4567,5 @@ \label{s:StandardHeaders} -C prescribes the following standard header-files: +C prescribes the following standard header-files~\cite[\S~7.1.2]{C11}: \begin{quote2} \begin{minipage}{\linewidth} @@ -4412,166 +4584,7 @@ \end{minipage} \end{quote2} -For the prescribed head-files, \CFA implicit wraps their includes in an ©extern "C"©; +For the prescribed head-files, \CFA implicitly wraps their includes in an ©extern "C"©; hence, names in these include files are not mangled\index{mangling!name} (see~\VRef{s:Interoperability}). All other C header files must be explicitly wrapped in ©extern "C"© to prevent name mangling. - - -\section{Incompatible} - -The following incompatibles exist between \CFA and C, and are similar to Annex C for \CC~\cite{ANSI14:C++}. - -\begin{enumerate} -\item -\begin{description} -\item[Change:] add new keywords (see~\VRef{s:NewKeywords}) \\ -New keywords are added to \CFA. -\item[Rationale:] keywords added to implement new semantics of \CFA. -\item[Effect on original feature:] change to semantics of well-defined feature. \\ -Any ISO C programs using these keywords as identifiers are invalid \CFA programs. -\item[Difficulty of converting:] keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism: -\begin{lstlisting} -int `otype` = 3; // make keyword an identifier -double `choose` = 3.5; -\end{lstlisting} -Programs can be converted automatically by enclosing keyword identifiers in backquotes, and the backquotes can be remove later when the identifier name is changed. -Clashes in C system libraries (include files) can be handled automatically using preprocessor, ©#include_next© and ©-Ifilename©: -\begin{lstlisting} -// include file uses the CFA keyword "otype". -#if ! defined( otype ) // nesting ? -#define otype `otype` -#define __CFA_BFD_H__ -#endif // ! otype - -#include_next // must have internal check for multiple expansion - -#if defined( otype ) && defined( __CFA_BFD_H__ ) // reset only if set -#undef otype -#undef __CFA_BFD_H__ -#endif // otype && __CFA_BFD_H__ -\end{lstlisting} -\item[How widely used:] clashes among new \CFA keywords and existing identifiers are rare. -\end{description} - -\item -\begin{description} -\item[Change:] type of character literal ©int© to ©char© to allow more intuitive overloading: -\begin{lstlisting} -int rtn( int i ); -int rtn( char c ); -rtn( 'x' ); // programmer expects 2nd rtn to be called -\end{lstlisting} -\item[Rationale:] it is more intuitive for the call to ©rtn© to match the second version of definition of ©rtn© rather than the first. -In particular, output of ©char© variable now print a character rather than the decimal ASCII value of the character. -\begin{lstlisting} -sout | 'x' | " " | (int)'x' | endl; -x 120 -\end{lstlisting} -Having to cast ©'x'© to ©char© is non-intuitive. -\item[Effect on original feature:] change to semantics of well-defined feature that depend on: -\begin{lstlisting} -sizeof( 'x' ) == sizeof( int ) -\end{lstlisting} -no long work the same in \CFA programs. -\item[Difficulty of converting:] simple -\item[How widely used:] programs that depend upon ©sizeof( 'x' )© are rare and can be changed to ©sizeof(char)©. -\end{description} - -\item -\begin{description} -\item[Change:] make string literals ©const©: -\begin{lstlisting} -char * p = "abc"; // valid in C, deprecated in §\CFA§ -char * q = expr ? "abc" : "de"; // valid in C, invalid in §\CFA§ -\end{lstlisting} -The type of a string literal is changed from ©[] char© to ©const [] char©. -Similarly, the type of a wide string literal is changed from ©[] wchar_t© to ©const [] wchar_t©. -\item[Rationale:] This change is a safety issue: -\begin{lstlisting} -char * p = "abc"; -p[0] = 'w'; // segment fault or change constant literal -\end{lstlisting} -The same problem occurs when passing a string literal to a routine that changes its argument. -\item[Effect on original feature:] change to semantics of well-defined feature. -\item[Difficulty of converting:] simple syntactic transformation, because string literals can be converted to ©char *©. -\item[How widely used:] programs that have a legitimate reason to treat string literals as pointers to potentially modifiable memory are rare. -\end{description} - -\item -\begin{description} -\item[Change:] remove \newterm{tentative definitions}, which only occurs at file scope: -\begin{lstlisting} -int i; // forward definition -int *j = ®&i®; // forward reference, valid in C, invalid in §\CFA§ -int i = 0; // definition -\end{lstlisting} -is valid in C, and invalid in \CFA because duplicate overloaded object definitions at the same scope level are disallowed. -This change makes it impossible to define mutually referential file-local static objects, if initializers are restricted to the syntactic forms of C. For example, -\begin{lstlisting} -struct X { int i; struct X *next; }; -static struct X a; // forward definition -static struct X b = { 0, ®&a® }; // forward reference, valid in C, invalid in §\CFA§ -static struct X a = { 1, &b }; // definition -\end{lstlisting} -\item[Rationale:] avoids having different initialization rules for builtin types and userdefined types. -\item[Effect on original feature:] change to semantics of well-defined feature. -\item[Difficulty of converting:] the initializer for one of a set of mutually-referential file-local static objects must invoke a routine call to achieve the initialization. -\item[How widely used:] seldom -\end{description} - -\item -\begin{description} -\item[Change:] have ©struct© introduce a scope for nested types -In C, the name of the nested types belongs to the same scope as the name of the outermost enclosing -Example: -\begin{lstlisting} -enum ®Colour® { R, G, B, Y, C, M }; -struct Person { - enum ®Colour® { R, G, B }; // nested type - struct Face { // nested type - ®Colour® Eyes, Hair; // type defined outside (1 level) - }; - ß.ß®Colour® shirt; // type defined outside (top level) - ®Colour® pants; // type defined same level - Face looks[10]; // type defined same level -}; -®Colour® c = R; // type/enum defined same level -Personß.ß®Colour® pc = Personß.ßR; // type/enum defined inside -Personß.ßFace pretty; // type defined inside -\end{lstlisting} -\item[Rationale:] ©struct© scope is crucial to \CFA as an information structuring and hiding mechanism. -\item[Effect on original feature:] change to semantics of well-defined feature. -\item[Difficulty of converting:] Semantic transformation. -\item[How widely used:] C programs rarely have nest types because they are equivalent to the hoisted version. - -\CFA is C \emph{incompatible} on this issue, and provides semantics similar to \Index*[C++]{\CC}. -Nested types are not hoisted and can be referenced using the field selection operator ``©.©'', unlike the \CC scope-resolution operator ``©::©''. -Given that nested types in C are equivalent to not using them, \ie they are essentially useless, it is unlikely there are any realistic usages that break because of this incompatibility. -\end{description} - -\item -\begin{description} -\item[Change:] In C++, the name of a nested class is local to its enclosing class. -\item[Rationale:] C++ classes have member functions which require that classes establish scopes. -\item[Difficulty of converting:] Semantic transformation. To make the struct type name visible in the scope of the enclosing struct, the struct tag could be declared in the scope of the enclosing struct, before the enclosing struct is defined. Example: -\begin{lstlisting} -struct Y; // struct Y and struct X are at the same scope -struct X { -struct Y { /* ... */ } y; -}; -\end{lstlisting} -All the definitions of C struct types enclosed in other struct definitions and accessed outside the scope of the enclosing struct could be exported to the scope of the enclosing struct. -Note: this is a consequence of the difference in scope rules, which is documented in 3.3. -\item[How widely used:] Seldom. -\end{description} - -\item -\begin{description} -\item[Change:] comma expression is disallowed as subscript -\item[Rationale:] safety issue to prevent subscripting error for multidimensional arrays: ©x[i,j]© instead of ©x[i][j]©, and this syntactic form then taken by \CFA for new style arrays. -\item[Effect on original feature:] change to semantics of well-defined feature. -\item[Difficulty of converting:] semantic transformation of ©x[i,j]© to ©x[(i,j)]© -\item[How widely used:] seldom. -\end{description} -\end{enumerate} @@ -4749,4 +4762,5 @@ \subsection{malloc} +\leavevmode \begin{lstlisting}[aboveskip=0pt,belowskip=0pt] forall( otype T ) T * malloc( void );§\indexc{malloc}§ @@ -4765,8 +4779,9 @@ forall( otype T ) T * memset( T * ptr ); // remove when default value available \end{lstlisting} -\ + \subsection{ato / strto} +\leavevmode \begin{lstlisting}[aboveskip=0pt,belowskip=0pt] int ato( const char * ptr );§\indexc{ato}§ @@ -4796,9 +4811,9 @@ long double _Complex strto( const char * sptr, char ** eptr ); \end{lstlisting} -\ \subsection{bsearch / qsort} +\leavevmode \begin{lstlisting}[aboveskip=0pt,belowskip=0pt] forall( otype T | { int ?get_name(); if ( decl->get_mangleName() != "" ) { // need to incorporate scope level in order to differentiate names for destructors @@ -311,5 +312,5 @@ Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() ); assert( type ); - newExpr->get_results().push_back( type ); + newExpr->get_results().push_back( type->clone() ); *arg = newExpr; } // if Index: src/CodeGen/CodeGenerator.h =================================================================== --- src/CodeGen/CodeGenerator.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/CodeGen/CodeGenerator.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -30,5 +30,5 @@ static int tabsize; - CodeGenerator( std::ostream &os ); + CodeGenerator( std::ostream &os, bool mangle = true ); CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false ); CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false ); @@ -114,4 +114,5 @@ std::ostream &output; LabelPrinter printLabels; + bool mangle = true; void printDesignators( std::list< Expression * > & ); @@ -119,4 +120,5 @@ void handleAggregate( AggregateDecl *aggDecl ); void handleTypedef( NamedTypeDecl *namedType ); + std::string mangleName( DeclarationWithType * decl ); }; // CodeGenerator Index: src/CodeGen/GenType.cc =================================================================== --- src/CodeGen/GenType.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/CodeGen/GenType.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// GenType.cc -- +// GenType.cc -- // // Author : Richard C. Bilson @@ -28,8 +28,8 @@ class GenType : public Visitor { public: - GenType( const std::string &typeString ); + GenType( const std::string &typeString, bool mangle = true ); std::string get_typeString() const { return typeString; } void set_typeString( const std::string &newValue ) { typeString = newValue; } - + virtual void visit( FunctionType *funcType ); virtual void visit( VoidType *voidType ); @@ -42,19 +42,20 @@ virtual void visit( TypeInstType *typeInst ); virtual void visit( VarArgsType *varArgsType ); - + private: void handleQualifiers( Type *type ); void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic ); - + std::string typeString; + bool mangle = true; }; - std::string genType( Type *type, const std::string &baseString ) { - GenType gt( baseString ); + std::string genType( Type *type, const std::string &baseString, bool mangle ) { + GenType gt( baseString, mangle ); type->accept( gt ); return gt.get_typeString(); } - GenType::GenType( const std::string &typeString ) : typeString( typeString ) {} + GenType::GenType( const std::string &typeString, bool mangle ) : typeString( typeString ), mangle( mangle ) {} void GenType::visit( VoidType *voidType ) { @@ -100,5 +101,5 @@ } // if if ( dimension != 0 ) { - CodeGenerator cg( os ); + CodeGenerator cg( os, mangle ); dimension->accept( cg ); } else if ( isVarLen ) { @@ -109,5 +110,5 @@ typeString = os.str(); - + base->accept( *this ); } @@ -142,5 +143,5 @@ } // if } // if - + /************* parameters ***************/ @@ -154,5 +155,5 @@ } // if } else { - CodeGenerator cg( os ); + CodeGenerator cg( os, mangle ); os << "(" ; @@ -164,5 +165,5 @@ os << ")"; } // if - + typeString = os.str(); Index: src/CodeGen/GenType.h =================================================================== --- src/CodeGen/GenType.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/CodeGen/GenType.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// GenType.h -- +// GenType.h -- // // Author : Richard C. Bilson @@ -21,5 +21,5 @@ namespace CodeGen { - std::string genType( Type *type, const std::string &baseString ); + std::string genType( Type *type, const std::string &baseString, bool mangle = true ); } // namespace CodeGen Index: src/Common/Assert.cc =================================================================== --- src/Common/Assert.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) +++ src/Common/Assert.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -0,0 +1,45 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// Assert.cc -- +// +// Author : Peter A. Buhr +// Created On : Thu Aug 18 13:26:59 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Fri Aug 19 17:07:08 2016 +// Update Count : 10 +// + +#include +#include // varargs +#include // fprintf +#include // abort + +extern const char * __progname; // global name of running executable (argv[0]) + +#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\"" + +// called by macro assert in assert.h +void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) { + fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file ); + abort(); +} + +// called by macro assertf +void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) { + fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file ); + va_list args; + va_start( args, fmt ); + vfprintf( stderr, fmt, args ); + abort(); +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // + Index: src/Common/CompilerError.h =================================================================== --- src/Common/CompilerError.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Common/CompilerError.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 19 07:20:37 2015 -// Update Count : 2 +// Last Modified On : Thu Aug 18 23:41:30 2016 +// Update Count : 3 // @@ -18,5 +18,4 @@ #include -//#include "../config.h" class CompilerError : public std::exception { Index: src/Common/module.mk =================================================================== --- src/Common/module.mk (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Common/module.mk (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -11,8 +11,9 @@ ## Created On : Mon Jun 1 17:49:17 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Mon Jun 1 17:51:23 2015 -## Update Count : 1 +## Last Modified On : Thu Aug 18 13:29:04 2016 +## Update Count : 2 ############################################################################### SRC += Common/SemanticError.cc \ - Common/UniqueName.cc + Common/UniqueName.cc \ + Common/Assert.cc Index: src/Common/utility.h =================================================================== --- src/Common/utility.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Common/utility.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -49,4 +49,11 @@ } +template< typename T, typename U > +static inline T * maybeMoveBuild( const U *orig ) { + T* ret = maybeBuild(orig); + delete orig; + return ret; +} + template< typename Input_iterator > void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) { @@ -137,7 +144,18 @@ template < typename T > -std::string toString ( T value ) { +void toString_single ( std::ostream & os, const T & value ) { + os << value; +} + +template < typename T, typename... Params > +void toString_single ( std::ostream & os, const T & value, const Params & ... params ) { + os << value; + toString_single( os, params ... ); +} + +template < typename ... Params > +std::string toString ( const Params & ... params ) { std::ostringstream os; - os << value; // << std::ends; + toString_single( os, params... ); return os.str(); } @@ -211,4 +229,21 @@ } +template< typename T > +void warn_single( const T & arg ) { + std::cerr << arg << std::endl; +} + +template< typename T, typename... Params > +void warn_single(const T & arg, const Params & ... params ) { + std::cerr << arg; + warn_single( params... ); +} + +template< typename... Params > +void warn( const Params & ... params ) { + std::cerr << "Warning: "; + warn_single( params... ); +} + #endif // _UTILITY_H Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/InitTweak/FixInit.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -33,4 +33,5 @@ #include "GenPoly/PolyMutator.h" #include "SynTree/AddStmtVisitor.h" +#include "CodeGen/GenType.h" // for warnings bool ctordtorp = false; @@ -174,4 +175,24 @@ virtual Expression * mutate( ImplicitCopyCtorExpr * impCpCtorExpr ); }; + + class WarnStructMembers : public Visitor { + public: + typedef Visitor Parent; + /// warn if a user-defined constructor or destructor is missing calls for + /// a struct member or if a member is used before constructed + static void warnings( std::list< Declaration * > & translationUnit ); + + virtual void visit( FunctionDecl * funcDecl ); + + virtual void visit( MemberExpr * memberExpr ); + virtual void visit( ApplicationExpr * appExpr ); + + private: + void handleFirstParam( Expression * firstParam ); + + FunctionDecl * function = 0; + std::set< DeclarationWithType * > unhandled; + ObjectDecl * thisParam = 0; + }; } // namespace @@ -187,4 +208,6 @@ // FixCopyCtors must happen after FixInit, so that destructors are placed correctly FixCopyCtors::fixCopyCtors( translationUnit ); + + WarnStructMembers::warnings( translationUnit ); } @@ -231,4 +254,11 @@ } + void WarnStructMembers::warnings( std::list< Declaration * > & translationUnit ) { + if ( true ) { // fix this condition to skip this pass if warnings aren't enabled + WarnStructMembers warner; + acceptAll( translationUnit, warner ); + } + } + Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) { appExpr = dynamic_cast< ApplicationExpr * >( Mutator::mutate( appExpr ) ); @@ -242,5 +272,5 @@ FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) ); assert( ftype ); - if ( (funcDecl->get_name() == "?{}" || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) { + if ( (isConstructor( funcDecl->get_name() ) || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) { Type * t1 = ftype->get_parameters().front()->get_type(); Type * t2 = ftype->get_parameters().back()->get_type(); @@ -253,5 +283,5 @@ return appExpr; } // if - } else if ( funcDecl->get_name() == "^?{}" ) { + } else if ( isDestructor( funcDecl->get_name() ) ) { // correctness: never copy construct arguments to a destructor return appExpr; @@ -284,5 +314,5 @@ UntypedExpr * untyped = new UntypedExpr( new NameExpr( fname ) ); untyped->get_args().push_back( new AddressExpr( new VariableExpr( var ) ) ); - if (cpArg) untyped->get_args().push_back( cpArg ); + if (cpArg) untyped->get_args().push_back( cpArg->clone() ); // resolve copy constructor @@ -670,4 +700,109 @@ } // switch } + + bool checkWarnings( FunctionDecl * funcDecl ) { + // only check for warnings if the current function is a user-defined + // constructor or destructor + if ( ! funcDecl ) return false; + if ( ! funcDecl->get_statements() ) return false; + return isCtorDtor( funcDecl->get_name() ) && ! LinkageSpec::isOverridable( funcDecl->get_linkage() ); + } + + void WarnStructMembers::visit( FunctionDecl * funcDecl ) { + WarnStructMembers old = *this; + *this = WarnStructMembers(); + + function = funcDecl; + if ( checkWarnings( funcDecl ) ) { + FunctionType * type = funcDecl->get_functionType(); + assert( ! type->get_parameters().empty() ); + thisParam = safe_dynamic_cast< ObjectDecl * >( type->get_parameters().front() ); + PointerType * ptrType = safe_dynamic_cast< PointerType * > ( thisParam->get_type() ); + StructInstType * structType = dynamic_cast< StructInstType * >( ptrType->get_base() ); + if ( structType ) { + StructDecl * structDecl = structType->get_baseStruct(); + for ( Declaration * member : structDecl->get_members() ) { + if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) { + // record all of the struct type's members that need to be constructed or + // destructed by the end of the function + unhandled.insert( field ); + } + } + } + } + Parent::visit( funcDecl ); + + for ( DeclarationWithType * member : unhandled ) { + // emit a warning for each unhandled member + warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" ); + } + + *this = old; + } + + void WarnStructMembers::visit( ApplicationExpr * appExpr ) { + if ( ! checkWarnings( function ) ) return; + + std::string fname = getFunctionName( appExpr ); + if ( fname == function->get_name() ) { + // call to same kind of function + Expression * firstParam = appExpr->get_args().front(); + + if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( firstParam ) ) { + // if calling another constructor on thisParam, assume that function handles + // all members - if it doesn't a warning will appear in that function. + if ( varExpr->get_var() == thisParam ) { + unhandled.clear(); + } + } else { + // if first parameter is a member expression then + // remove the member from unhandled set. + handleFirstParam( firstParam ); + } + } else if ( fname == "?=?" && isIntrinsicCallExpr( appExpr ) ) { + // forgive use of intrinsic assignment to construct, since instrinsic constructors + // codegen as assignment anyway. + assert( appExpr->get_args().size() == 2 ); + handleFirstParam( appExpr->get_args().front() ); + } + + Parent::visit( appExpr ); + } + + void WarnStructMembers::handleFirstParam( Expression * firstParam ) { + using namespace std; + if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( firstParam ) ) { + if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( addrExpr->get_arg() ) ) { + if ( ApplicationExpr * deref = dynamic_cast< ApplicationExpr * >( memberExpr->get_aggregate() ) ) { + if ( getFunctionName( deref ) == "*?" && deref->get_args().size() == 1 ) { + if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( deref->get_args().front() ) ) { + if ( varExpr->get_var() == thisParam ) { + unhandled.erase( memberExpr->get_member() ); + } + } + } + } + } + } + } + + void WarnStructMembers::visit( MemberExpr * memberExpr ) { + if ( ! checkWarnings( function ) ) return; + if ( ! isConstructor( function->get_name() ) ) return; + + if ( ApplicationExpr * deref = dynamic_cast< ApplicationExpr * >( memberExpr->get_aggregate() ) ) { + if ( getFunctionName( deref ) == "*?" && deref->get_args().size() == 1 ) { + if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( deref->get_args().front() ) ) { + if ( varExpr->get_var() == thisParam ) { + if ( unhandled.count( memberExpr->get_member() ) ) { + // emit a warning because a member was used before it was constructed + warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" ); + } + } + } + } + } + Parent::visit( memberExpr ); + } } // namespace } // namespace InitTweak Index: src/InitTweak/InitTweak.cc =================================================================== --- src/InitTweak/InitTweak.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/InitTweak/InitTweak.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -291,9 +291,16 @@ } + namespace { + template + bool allofCtorDtor( Statement * stmt, const Predicate & pred ) { + std::list< Expression * > callExprs; + collectCtorDtorCalls( stmt, callExprs ); + // if ( callExprs.empty() ) return false; // xxx - do I still need this check? + return std::all_of( callExprs.begin(), callExprs.end(), pred); + } + } + bool isIntrinsicSingleArgCallStmt( Statement * stmt ) { - std::list< Expression * > callExprs; - collectCtorDtorCalls( stmt, callExprs ); - // if ( callExprs.empty() ) return false; // xxx - do I still need this check? - return std::all_of( callExprs.begin(), callExprs.end(), []( Expression * callExpr ){ + return allofCtorDtor( stmt, []( Expression * callExpr ){ if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) { assert( ! appExpr->get_function()->get_results().empty() ); @@ -303,4 +310,10 @@ } return false; + }); + } + + bool isIntrinsicCallStmt( Statement * stmt ) { + return allofCtorDtor( stmt, []( Expression * callExpr ) { + return isIntrinsicCallExpr( callExpr ); }); } @@ -420,3 +433,6 @@ } + bool isConstructor( const std::string & str ) { return str == "?{}"; } + bool isDestructor( const std::string & str ) { return str == "^?{}"; } + bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); } } Index: src/InitTweak/InitTweak.h =================================================================== --- src/InitTweak/InitTweak.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/InitTweak/InitTweak.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -26,4 +26,8 @@ // helper functions for initialization namespace InitTweak { + bool isConstructor( const std::string & ); + bool isDestructor( const std::string & ); + bool isCtorDtor( const std::string & ); + /// transform Initializer into an argument list that can be passed to a call expression std::list< Expression * > makeInitList( Initializer * init ); @@ -41,5 +45,8 @@ /// Intended to be used for default ctor/dtor calls, but might have use elsewhere. /// Currently has assertions that make it less than fully general. - bool isIntrinsicSingleArgCallStmt( Statement * expr ); + bool isIntrinsicSingleArgCallStmt( Statement * stmt ); + + /// True if stmt is a call statement where the function called is intrinsic. + bool isIntrinsicCallStmt( Statement * stmt ); /// get all Ctor/Dtor call expressions from a Statement Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Makefile.am (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 08:51:46 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Fri Jul 8 12:22:25 2016 -## Update Count : 60 +## Last Modified On : Sat Aug 20 11:13:12 2016 +## Update Count : 71 ############################################################################### @@ -42,9 +42,6 @@ cfa_cpplib_PROGRAMS = driver/cfa-cpp driver_cfa_cpp_SOURCES = ${SRC} -driver_cfa_cpp_LDADD = ${LEXLIB} # yywrap -# need files Common/utility.h -driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL - -AM_CXXFLAGS = -g -std=c++11 +driver_cfa_cpp_LDADD = ${LEXLIB} # yywrap +driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}} Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Makefile.in (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -105,4 +105,5 @@ Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \ Common/driver_cfa_cpp-UniqueName.$(OBJEXT) \ + Common/driver_cfa_cpp-Assert.$(OBJEXT) \ ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) \ ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \ @@ -137,5 +138,4 @@ Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) \ Parser/driver_cfa_cpp-parseutility.$(OBJEXT) \ - Parser/driver_cfa_cpp-Parser.$(OBJEXT) \ ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT) \ ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT) \ @@ -370,5 +370,5 @@ CodeGen/CodeGenerator.cc CodeGen/GenType.cc \ CodeGen/FixNames.cc CodeGen/OperatorTable.cc \ - Common/SemanticError.cc Common/UniqueName.cc \ + Common/SemanticError.cc Common/UniqueName.cc Common/Assert.cc \ ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \ ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \ @@ -385,5 +385,5 @@ Parser/ExpressionNode.cc Parser/StatementNode.cc \ Parser/InitializerNode.cc Parser/TypeData.cc \ - Parser/LinkageSpec.cc Parser/parseutility.cc Parser/Parser.cc \ + Parser/LinkageSpec.cc Parser/parseutility.cc \ ResolvExpr/AlternativeFinder.cc ResolvExpr/Alternative.cc \ ResolvExpr/Unify.cc ResolvExpr/PtrsAssignable.cc \ @@ -426,8 +426,6 @@ cfa_cpplibdir = ${libdir} driver_cfa_cpp_SOURCES = ${SRC} -driver_cfa_cpp_LDADD = ${LEXLIB} # yywrap -# need files Common/utility.h -driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -AM_CXXFLAGS = -g -std=c++11 +driver_cfa_cpp_LDADD = ${LEXLIB} # yywrap +driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -528,4 +526,6 @@ Common/$(DEPDIR)/$(am__dirstamp) Common/driver_cfa_cpp-UniqueName.$(OBJEXT): Common/$(am__dirstamp) \ + Common/$(DEPDIR)/$(am__dirstamp) +Common/driver_cfa_cpp-Assert.$(OBJEXT): Common/$(am__dirstamp) \ Common/$(DEPDIR)/$(am__dirstamp) ControlStruct/$(am__dirstamp): @@ -632,6 +632,4 @@ Parser/$(DEPDIR)/$(am__dirstamp) Parser/driver_cfa_cpp-parseutility.$(OBJEXT): Parser/$(am__dirstamp) \ - Parser/$(DEPDIR)/$(am__dirstamp) -Parser/driver_cfa_cpp-Parser.$(OBJEXT): Parser/$(am__dirstamp) \ Parser/$(DEPDIR)/$(am__dirstamp) ResolvExpr/$(am__dirstamp): @@ -817,4 +815,5 @@ -rm -f CodeGen/driver_cfa_cpp-Generate.$(OBJEXT) -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT) + -rm -f Common/driver_cfa_cpp-Assert.$(OBJEXT) -rm -f Common/driver_cfa_cpp-SemanticError.$(OBJEXT) -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT) @@ -845,5 +844,4 @@ -rm -f Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) -rm -f Parser/driver_cfa_cpp-ParseNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-Parser.$(OBJEXT) -rm -f Parser/driver_cfa_cpp-StatementNode.$(OBJEXT) -rm -f Parser/driver_cfa_cpp-TypeData.$(OBJEXT) @@ -927,4 +925,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@ @@ -955,5 +954,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Po@am__quote@ @@ -1169,4 +1167,18 @@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-UniqueName.obj `if test -f 'Common/UniqueName.cc'; then $(CYGPATH_W) 'Common/UniqueName.cc'; else $(CYGPATH_W) '$(srcdir)/Common/UniqueName.cc'; fi` +Common/driver_cfa_cpp-Assert.o: Common/Assert.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Assert.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc + +Common/driver_cfa_cpp-Assert.obj: Common/Assert.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Assert.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi` + ControlStruct/driver_cfa_cpp-LabelGenerator.o: ControlStruct/LabelGenerator.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-LabelGenerator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.o `test -f 'ControlStruct/LabelGenerator.cc' || echo '$(srcdir)/'`ControlStruct/LabelGenerator.cc @@ -1616,18 +1628,4 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-parseutility.obj `if test -f 'Parser/parseutility.cc'; then $(CYGPATH_W) 'Parser/parseutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parseutility.cc'; fi` - -Parser/driver_cfa_cpp-Parser.o: Parser/Parser.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-Parser.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo -c -o Parser/driver_cfa_cpp-Parser.o `test -f 'Parser/Parser.cc' || echo '$(srcdir)/'`Parser/Parser.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Parser/Parser.cc' object='Parser/driver_cfa_cpp-Parser.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-Parser.o `test -f 'Parser/Parser.cc' || echo '$(srcdir)/'`Parser/Parser.cc - -Parser/driver_cfa_cpp-Parser.obj: Parser/Parser.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-Parser.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo -c -o Parser/driver_cfa_cpp-Parser.obj `if test -f 'Parser/Parser.cc'; then $(CYGPATH_W) 'Parser/Parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/Parser.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Parser/Parser.cc' object='Parser/driver_cfa_cpp-Parser.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Parser/driver_cfa_cpp-Parser.obj `if test -f 'Parser/Parser.cc'; then $(CYGPATH_W) 'Parser/Parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/Parser.cc'; fi` ResolvExpr/driver_cfa_cpp-AlternativeFinder.o: ResolvExpr/AlternativeFinder.cc Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/DeclarationNode.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 12:34:05 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Aug 9 08:39:20 2016 -// Update Count : 169 +// Last Modified On : Sun Aug 28 22:12:44 2016 +// Update Count : 278 // @@ -25,5 +25,4 @@ #include "SynTree/Expression.h" -#include "Parser.h" #include "TypedefTable.h" extern TypedefTable typedefTable; @@ -42,5 +41,5 @@ UniqueName DeclarationNode::anonymous( "__anonymous" ); -extern LinkageSpec::Type linkage; // defined in parser.yy +extern LinkageSpec::Spec linkage; // defined in parser.yy DeclarationNode *DeclarationNode::clone() const { @@ -48,15 +47,26 @@ newnode->type = maybeClone( type ); newnode->name = name; - newnode->storageClasses = storageClasses; -//PAB newnode->bitfieldWidth = maybeClone( bitfieldWidth ); - newnode->bitfieldWidth = bitfieldWidth; + newnode->storageClass = storageClass; + newnode->isInline = isInline; + newnode->isNoreturn = isNoreturn; + newnode->bitfieldWidth = maybeClone( bitfieldWidth ); newnode->hasEllipsis = hasEllipsis; - newnode->initializer = initializer; - newnode->next = maybeClone( next ); + newnode->initializer = maybeClone( initializer ); + newnode->set_next( maybeClone( get_next() ) ); newnode->linkage = linkage; return newnode; } // DeclarationNode::clone -DeclarationNode::DeclarationNode() : type( 0 ), bitfieldWidth( 0 ), initializer( 0 ), hasEllipsis( false ), linkage( ::linkage ) { +DeclarationNode::DeclarationNode() + : type( 0 ) + , storageClass( NoStorageClass ) + , isInline( false ) + , isNoreturn( false ) + , bitfieldWidth( 0 ) + , initializer( 0 ) + , hasEllipsis( false ) + , linkage( ::linkage ) + , extension( false ) + , error() { } @@ -83,5 +93,7 @@ } // if - printEnums( storageClasses.begin(), storageClasses.end(), DeclarationNode::storageName, os ); + if ( storageClass != NoStorageClass ) os << DeclarationNode::storageName[storageClass] << ' '; + if ( isInline ) os << DeclarationNode::storageName[Inline] << ' '; + if ( isNoreturn ) os << DeclarationNode::storageName[Noreturn] << ' '; if ( type ) { type->print( os, indent ); @@ -135,18 +147,30 @@ } // DeclarationNode::newFunction -DeclarationNode *DeclarationNode::newQualifier( Qualifier q ) { +DeclarationNode * DeclarationNode::newQualifier( Qualifier q ) { DeclarationNode *newnode = new DeclarationNode; newnode->type = new TypeData(); - newnode->type->qualifiers.push_back( q ); + newnode->type->qualifiers[ q ] = 1; return newnode; } // DeclarationNode::newQualifier -DeclarationNode *DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) { - DeclarationNode *newnode = new DeclarationNode; - newnode->storageClasses.push_back( sc ); +DeclarationNode * DeclarationNode::newForall( DeclarationNode *forall ) { + DeclarationNode *newnode = new DeclarationNode; + newnode->type = new TypeData( TypeData::Unknown ); + newnode->type->forall = forall; + return newnode; +} // DeclarationNode::newForall + +DeclarationNode * DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) { + DeclarationNode *newnode = new DeclarationNode; + //switch (sc) { + // case Inline: newnode->isInline = true; break; + // case Noreturn: newnode->isNoreturn = true; break; + // default: newnode->storageClass = sc; break; + //} + newnode->storageClass = sc; return newnode; } // DeclarationNode::newStorageClass -DeclarationNode *DeclarationNode::newBasicType( BasicType bt ) { +DeclarationNode * DeclarationNode::newBasicType( BasicType bt ) { DeclarationNode *newnode = new DeclarationNode; newnode->type = new TypeData( TypeData::Basic ); @@ -155,5 +179,12 @@ } // DeclarationNode::newBasicType -DeclarationNode *DeclarationNode::newBuiltinType( BuiltinType bt ) { +DeclarationNode * DeclarationNode::newModifier( Modifier mod ) { + DeclarationNode *newnode = new DeclarationNode; + newnode->type = new TypeData( TypeData::Basic ); + newnode->type->basic->modifiers.push_back( mod ); + return newnode; +} // DeclarationNode::newModifier + +DeclarationNode * DeclarationNode::newBuiltinType( BuiltinType bt ) { DeclarationNode *newnode = new DeclarationNode; newnode->type = new TypeData( TypeData::Builtin ); @@ -162,19 +193,5 @@ } // DeclarationNode::newBuiltinType -DeclarationNode *DeclarationNode::newModifier( Modifier mod ) { - DeclarationNode *newnode = new DeclarationNode; - newnode->type = new TypeData( TypeData::Basic ); - newnode->type->basic->modifiers.push_back( mod ); - return newnode; -} // DeclarationNode::newModifier - -DeclarationNode *DeclarationNode::newForall( DeclarationNode *forall ) { - DeclarationNode *newnode = new DeclarationNode; - newnode->type = new TypeData( TypeData::Unknown ); - newnode->type->forall = forall; - return newnode; -} // DeclarationNode::newForall - -DeclarationNode *DeclarationNode::newFromTypedef( std::string *name ) { +DeclarationNode * DeclarationNode::newFromTypedef( std::string *name ) { DeclarationNode *newnode = new DeclarationNode; newnode->type = new TypeData( TypeData::SymbolicInst ); @@ -185,5 +202,5 @@ } // DeclarationNode::newFromTypedef -DeclarationNode *DeclarationNode::newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body ) { +DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body ) { DeclarationNode *newnode = new DeclarationNode; newnode->type = new TypeData( TypeData::Aggregate ); @@ -214,5 +231,5 @@ DeclarationNode *newnode = new DeclarationNode; newnode->name = assign_strptr( name ); - newnode->enumeratorValue = constant; + newnode->enumeratorValue.reset( constant ); typedefTable.addToEnclosingScope( newnode->name, TypedefTable::ID ); return newnode; @@ -284,5 +301,5 @@ newnode->type->array->dimension = size; newnode->type->array->isStatic = isStatic; - if ( newnode->type->array->dimension == 0 || dynamic_cast( newnode->type->array->dimension->build() ) ) { + if ( newnode->type->array->dimension == 0 || newnode->type->array->dimension->isExpressionType() ) { newnode->type->array->isVarLen = false; } else { @@ -353,15 +370,34 @@ src = 0; } else { - dst->qualifiers.splice( dst->qualifiers.end(), src->qualifiers ); - } // if - } // if -} + dst->qualifiers |= src->qualifiers; + } // if + } // if +} + +void DeclarationNode::checkQualifiers( const TypeData *src, const TypeData *dst ) { + TypeData::Qualifiers qsrc = src->qualifiers, qdst = dst->qualifiers; + + if ( (qsrc & qdst).any() ) { // common bits between qualifier masks ? + error = "duplicate qualifier "; + int j = 0; // separator detector + for ( int i = 0; i < DeclarationNode::NoOfQualifier; i += 1 ) { + if ( qsrc[i] & qdst[i] ) { // find specific qualifiers in common + if ( j > 0 ) error += ", "; + error += DeclarationNode::qualifierName[i]; + j += 1; + } // if + } // for + error += " in declaration of "; + } // if +} // DeclarationNode::checkQualifiers DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) { if ( q ) { - storageClasses.splice( storageClasses.end(), q->storageClasses ); + copyStorageClasses(q); if ( q->type ) { if ( ! type ) { type = new TypeData; + } else { + checkQualifiers( q->type, type ); } // if addQualifiersToType( q->type, type ); @@ -387,5 +423,12 @@ DeclarationNode *DeclarationNode::copyStorageClasses( DeclarationNode *q ) { - storageClasses = q->storageClasses; + isInline = isInline || q->isInline; + isNoreturn = isNoreturn || q->isNoreturn; + if ( storageClass == NoStorageClass ) { + storageClass = q->storageClass; + } else if ( q->storageClass != NoStorageClass ) { + q->error = "invalid combination of storage classes in declaration of "; + } // if + if ( error.empty() ) error = q->error; return this; } @@ -406,10 +449,10 @@ switch ( dst->kind ) { case TypeData::Unknown: - src->qualifiers.splice( src->qualifiers.end(), dst->qualifiers ); + src->qualifiers |= dst->qualifiers; dst = src; src = 0; break; case TypeData::Basic: - dst->qualifiers.splice( dst->qualifiers.end(), src->qualifiers ); + dst->qualifiers |= src->qualifiers; if ( src->kind != TypeData::Unknown ) { assert( src->kind == TypeData::Basic ); @@ -427,5 +470,5 @@ dst->base->aggInst->params = maybeClone( src->aggregate->actuals ); } // if - dst->base->qualifiers.splice( dst->base->qualifiers.end(), src->qualifiers ); + dst->base->qualifiers |= src->qualifiers; src = 0; break; @@ -447,5 +490,5 @@ DeclarationNode *DeclarationNode::addType( DeclarationNode *o ) { if ( o ) { - storageClasses.splice( storageClasses.end(), o->storageClasses ); + copyStorageClasses( o ); if ( o->type ) { if ( ! type ) { @@ -456,5 +499,5 @@ type->aggInst->params = maybeClone( o->type->aggregate->actuals ); } // if - type->qualifiers.splice( type->qualifiers.end(), o->type->qualifiers ); + type->qualifiers |= o->type->qualifiers; } else { type = o->type; @@ -470,6 +513,6 @@ // there may be typedefs chained onto the type - if ( o->get_link() ) { - set_link( o->get_link()->clone() ); + if ( o->get_next() ) { + set_last( o->get_next()->clone() ); } // if } // if @@ -591,5 +634,5 @@ p->type->base->aggInst->params = maybeClone( type->aggregate->actuals ); } // if - p->type->base->qualifiers.splice( p->type->base->qualifiers.end(), type->qualifiers ); + p->type->base->qualifiers |= type->qualifiers; break; @@ -628,5 +671,5 @@ lastArray->base->aggInst->params = maybeClone( type->aggregate->actuals ); } // if - lastArray->base->qualifiers.splice( lastArray->base->qualifiers.end(), type->qualifiers ); + lastArray->base->qualifiers |= type->qualifiers; break; default: @@ -694,5 +737,5 @@ } // if newnode->type->forall = maybeClone( type->forall ); - newnode->storageClasses = storageClasses; + newnode->copyStorageClasses( this ); newnode->name = assign_strptr( newName ); return newnode; @@ -701,5 +744,5 @@ DeclarationNode *DeclarationNode::cloneBaseType( DeclarationNode *o ) { if ( o ) { - o->storageClasses.insert( o->storageClasses.end(), storageClasses.begin(), storageClasses.end() ); + o->copyStorageClasses( this ); if ( type ) { TypeData *srcType = type; @@ -734,5 +777,5 @@ DeclarationNode *newnode = new DeclarationNode; newnode->type = maybeClone( type ); - newnode->storageClasses = storageClasses; + newnode->copyStorageClasses( this ); newnode->name = assign_strptr( newName ); return newnode; @@ -741,5 +784,5 @@ DeclarationNode *DeclarationNode::cloneType( DeclarationNode *o ) { if ( o ) { - o->storageClasses.insert( o->storageClasses.end(), storageClasses.begin(), storageClasses.end() ); + o->copyStorageClasses( this ); if ( type ) { TypeData *newType = type->clone(); @@ -752,17 +795,11 @@ } // if } // if + delete o; return o; -} - -DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) { - if ( node != 0 ) { - set_link( node ); - } // if - return this; } DeclarationNode *DeclarationNode::extractAggregate() const { if ( type ) { - TypeData *ret = type->extractAggregate(); + TypeData *ret = typeextractAggregate( type ); if ( ret ) { DeclarationNode *newnode = new DeclarationNode; @@ -776,5 +813,5 @@ void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList ) { SemanticError errors; - std::back_insert_iterator< std::list< Declaration *> > out( outputList ); + std::back_insert_iterator< std::list< Declaration * > > out( outputList ); const DeclarationNode *cur = firstNode; while ( cur ) { @@ -786,4 +823,5 @@ *out++ = decl; } // if + delete extr; } // if Declaration *decl = cur->build(); @@ -794,5 +832,5 @@ errors.append( e ); } // try - cur = dynamic_cast( cur->get_link() ); + cur = dynamic_cast< DeclarationNode * >( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -801,7 +839,7 @@ } -void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList ) { +void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList ) { SemanticError errors; - std::back_insert_iterator< std::list< DeclarationWithType *> > out( outputList ); + std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList ); const DeclarationNode *cur = firstNode; while ( cur ) { @@ -817,11 +855,11 @@ Declaration *decl = cur->build(); if ( decl ) { - if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType *>( decl ) ) { + if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( decl ) ) { *out++ = dwt; - } else if ( StructDecl *agg = dynamic_cast< StructDecl *>( decl ) ) { + } else if ( StructDecl *agg = dynamic_cast< StructDecl * >( decl ) ) { StructInstType *inst = new StructInstType( Type::Qualifiers(), agg->get_name() ); *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 ); delete agg; - } else if ( UnionDecl *agg = dynamic_cast< UnionDecl *>( decl ) ) { + } else if ( UnionDecl *agg = dynamic_cast< UnionDecl * >( decl ) ) { UnionInstType *inst = new UnionInstType( Type::Qualifiers(), agg->get_name() ); *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 ); @@ -831,5 +869,5 @@ errors.append( e ); } // try - cur = dynamic_cast< DeclarationNode *>( cur->get_link() ); + cur = dynamic_cast< DeclarationNode * >( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -838,7 +876,7 @@ } -void buildTypeList( const DeclarationNode *firstNode, std::list< Type *> &outputList ) { +void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList ) { SemanticError errors; - std::back_insert_iterator< std::list< Type *> > out( outputList ); + std::back_insert_iterator< std::list< Type * > > out( outputList ); const DeclarationNode *cur = firstNode; while ( cur ) { @@ -848,5 +886,5 @@ errors.append( e ); } // try - cur = dynamic_cast< DeclarationNode *>( cur->get_link() ); + cur = dynamic_cast< DeclarationNode * >( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -856,9 +894,10 @@ Declaration *DeclarationNode::build() const { + if ( ! error.empty() ) throw SemanticError( error, this ); if ( type ) { - return type->buildDecl( name, buildStorageClass(), maybeBuild< Expression >( bitfieldWidth ), buildFuncSpecifier( Inline ), buildFuncSpecifier( Noreturn ), linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension ); - } // if - if ( ! buildFuncSpecifier( Inline ) && ! buildFuncSpecifier( Noreturn ) ) { - return (new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) ))->set_extension( extension ); + return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension ); + } // if + if ( ! isInline && ! isNoreturn ) { + return (new ObjectDecl( name, storageClass, linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) ))->set_extension( extension ); } // if throw SemanticError( "invalid function specifier in declaration of ", this ); @@ -870,16 +909,16 @@ switch ( type->kind ) { case TypeData::Enum: - return new EnumInstType( type->buildQualifiers(), type->enumeration->name ); + return new EnumInstType( buildQualifiers( type ), type->enumeration->name ); case TypeData::Aggregate: { ReferenceToType *ret; switch ( type->aggregate->kind ) { case DeclarationNode::Struct: - ret = new StructInstType( type->buildQualifiers(), type->aggregate->name ); + ret = new StructInstType( buildQualifiers( type ), type->aggregate->name ); break; case DeclarationNode::Union: - ret = new UnionInstType( type->buildQualifiers(), type->aggregate->name ); + ret = new UnionInstType( buildQualifiers( type ), type->aggregate->name ); break; case DeclarationNode::Trait: - ret = new TraitInstType( type->buildQualifiers(), type->aggregate->name ); + ret = new TraitInstType( buildQualifiers( type ), type->aggregate->name ); break; default: @@ -890,32 +929,32 @@ } case TypeData::Symbolic: { - TypeInstType *ret = new TypeInstType( type->buildQualifiers(), type->symbolic->name, false ); + TypeInstType *ret = new TypeInstType( buildQualifiers( type ), type->symbolic->name, false ); buildList( type->symbolic->actuals, ret->get_parameters() ); return ret; } default: - return type->build(); + return typebuild( type ); } // switch } -DeclarationNode::StorageClass DeclarationNode::buildStorageClass() const { - DeclarationNode::StorageClass ret = DeclarationNode::NoStorageClass; - for ( std::list< DeclarationNode::StorageClass >::const_iterator i = storageClasses.begin(); i != storageClasses.end(); ++i ) { - if ( *i == DeclarationNode::Inline || *i == DeclarationNode::Noreturn ) continue; // ignore function specifiers - if ( ret != DeclarationNode::NoStorageClass ) { // already have a valid storage class ? - throw SemanticError( "invalid combination of storage classes in declaration of ", this ); - } // if - ret = *i; - } // for - return ret; -} - -bool DeclarationNode::buildFuncSpecifier( DeclarationNode::StorageClass key ) const { - std::list< DeclarationNode::StorageClass >::const_iterator first = std::find( storageClasses.begin(), storageClasses.end(), key ); - if ( first == storageClasses.end() ) return false; // not found - first = std::find( ++first, storageClasses.end(), key ); // found - if ( first == storageClasses.end() ) return true; // not found again - throw SemanticError( "duplicate function specifier in declaration of ", this ); -} +// DeclarationNode::StorageClass DeclarationNode::buildStorageClass() const { +// DeclarationNode::StorageClass ret = DeclarationNode::NoStorageClass; +// for ( std::list< DeclarationNode::StorageClass >::const_iterator i = storageClasses.begin(); i != storageClasses.end(); ++i ) { +// if ( *i == DeclarationNode::Inline || *i == DeclarationNode::Noreturn ) continue; // ignore function specifiers +// if ( ret != DeclarationNode::NoStorageClass ) { // already have a valid storage class ? +// throw SemanticError( "invalid combination of storage classes in declaration of ", this ); +// } // if +// ret = *i; +// } // for +// return ret; +// } + +// bool DeclarationNode::buildFuncSpecifier( DeclarationNode::StorageClass key ) const { +// std::list< DeclarationNode::StorageClass >::const_iterator first = std::find( storageClasses.begin(), storageClasses.end(), key ); +// if ( first == storageClasses.end() ) return false; // not found +// first = std::find( ++first, storageClasses.end(), key ); // found +// if ( first == storageClasses.end() ) return true; // not found again +// throw SemanticError( "duplicate function specifier in declaration of ", this ); +// } // Local Variables: // Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/ExpressionNode.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Aug 10 11:07:38 2016 -// Update Count : 486 +// Last Modified On : Thu Aug 25 21:39:40 2016 +// Update Count : 503 // @@ -32,5 +32,5 @@ using namespace std; -ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.name ), extension( other.extension ) {} +ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.get_name() ), extension( other.extension ) {} //############################################################################## @@ -57,5 +57,5 @@ static inline bool checkX( char c ) { return c == 'x' || c == 'X'; } -Expression *build_constantInteger( std::string & str ) { +Expression *build_constantInteger( const std::string & str ) { static const BasicType::Kind kind[2][3] = { { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt }, @@ -120,8 +120,10 @@ } // if - return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) ); + Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) ); + delete &str; // created by lex + return ret; } // build_constantInteger -Expression *build_constantFloat( std::string & str ) { +Expression *build_constantFloat( const std::string & str ) { static const BasicType::Kind kind[2][3] = { { BasicType::Float, BasicType::Double, BasicType::LongDouble }, @@ -150,12 +152,16 @@ } // if - return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) ); + Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) ); + delete &str; // created by lex + return ret; } // build_constantFloat -Expression *build_constantChar( std::string & str ) { - return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) ); +Expression *build_constantChar( const std::string & str ) { + Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) ); + delete &str; // created by lex + return ret; } // build_constantChar -ConstantExpr *build_constantStr( std::string & str ) { +ConstantExpr *build_constantStr( const std::string & str ) { // string should probably be a primitive type ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ), @@ -163,14 +169,14 @@ toString( str.size()+1-2 ) ) ), // +1 for '\0' and -2 for '"' false, false ); - return new ConstantExpr( Constant( at, str ) ); + ConstantExpr * ret = new ConstantExpr( Constant( at, str ) ); + delete &str; // created by lex + return ret; } // build_constantStr -//############################################################################## - NameExpr * build_varref( const string *name, bool labelp ) { - return new NameExpr( *name, nullptr ); -} - -//############################################################################## + NameExpr *expr = new NameExpr( *name, nullptr ); + delete name; + return expr; +} static const char *OperName[] = { @@ -178,5 +184,5 @@ "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&", "?|?", "?&?", "?^?", "Cast", "?<>?", "??", "?<=?", "?>=?", "?==?", "?!=?", - "?=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?", + "?=?", "?@=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?", "?[?]", "...", // monadic @@ -184,18 +190,16 @@ }; -//############################################################################## - Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) { - Type *targetType = decl_node->buildType(); + Type *targetType = maybeMoveBuildType( decl_node ); if ( dynamic_cast< VoidType * >( targetType ) ) { delete targetType; - return new CastExpr( maybeBuild(expr_node) ); + return new CastExpr( maybeMoveBuild< Expression >(expr_node) ); } else { - return new CastExpr( maybeBuild(expr_node), targetType ); + return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType ); } // if } Expression *build_fieldSel( ExpressionNode *expr_node, NameExpr *member ) { - UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeBuild(expr_node) ); + UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeMoveBuild< Expression >(expr_node) ); delete member; return ret; @@ -204,5 +208,5 @@ Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member ) { UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) ); - deref->get_args().push_back( maybeBuild(expr_node) ); + deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) ); UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref ); delete member; @@ -211,173 +215,104 @@ Expression *build_addressOf( ExpressionNode *expr_node ) { - return new AddressExpr( maybeBuild(expr_node) ); + return new AddressExpr( maybeMoveBuild< Expression >(expr_node) ); } Expression *build_sizeOfexpr( ExpressionNode *expr_node ) { - return new SizeofExpr( maybeBuild(expr_node) ); + return new SizeofExpr( maybeMoveBuild< Expression >(expr_node) ); } Expression *build_sizeOftype( DeclarationNode *decl_node ) { - return new SizeofExpr( decl_node->buildType() ); + return new SizeofExpr( maybeMoveBuildType( decl_node ) ); } Expression *build_alignOfexpr( ExpressionNode *expr_node ) { - return new AlignofExpr( maybeBuild(expr_node) ); + return new AlignofExpr( maybeMoveBuild< Expression >(expr_node) ); } Expression *build_alignOftype( DeclarationNode *decl_node ) { - return new AlignofExpr( decl_node->buildType() ); + return new AlignofExpr( maybeMoveBuildType( decl_node) ); } Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) { - return new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() ); + Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() ); + delete member; + return ret; } Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind ) { - return new LogicalExpr( notZeroExpr( maybeBuild(expr_node1) ), notZeroExpr( maybeBuild(expr_node2) ), kind ); + return new LogicalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), notZeroExpr( maybeMoveBuild< Expression >(expr_node2) ), kind ); } Expression *build_unary_val( OperKinds op, ExpressionNode *expr_node ) { - std::list args; - args.push_back( maybeBuild(expr_node) ); + std::list< Expression * > args; + args.push_back( maybeMoveBuild< Expression >(expr_node) ); return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args ); } Expression *build_unary_ptr( OperKinds op, ExpressionNode *expr_node ) { - std::list args; - args.push_back( new AddressExpr( maybeBuild(expr_node) ) ); + std::list< Expression * > args; + args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node) ) ); return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args ); } Expression *build_binary_val( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) { - std::list args; - args.push_back( maybeBuild(expr_node1) ); - args.push_back( maybeBuild(expr_node2) ); + std::list< Expression * > args; + args.push_back( maybeMoveBuild< Expression >(expr_node1) ); + args.push_back( maybeMoveBuild< Expression >(expr_node2) ); return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args ); } Expression *build_binary_ptr( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) { - std::list args; - args.push_back( new AddressExpr( maybeBuild(expr_node1) ) ); - args.push_back( maybeBuild(expr_node2) ); + std::list< Expression * > args; + args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node1) ) ); + args.push_back( maybeMoveBuild< Expression >(expr_node2) ); return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args ); } Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 ) { - return new ConditionalExpr( notZeroExpr( maybeBuild(expr_node1) ), maybeBuild(expr_node2), maybeBuild(expr_node3) ); + return new ConditionalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), maybeMoveBuild< Expression >(expr_node2), maybeMoveBuild< Expression >(expr_node3) ); } Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) { - return new CommaExpr( maybeBuild(expr_node1), maybeBuild(expr_node2) ); + return new CommaExpr( maybeMoveBuild< Expression >(expr_node1), maybeMoveBuild< Expression >(expr_node2) ); } Expression *build_attrexpr( NameExpr *var, ExpressionNode * expr_node ) { - return new AttrExpr( var, maybeBuild(expr_node) ); + return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) ); } Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) { - return new AttrExpr( var, decl_node->buildType() ); + return new AttrExpr( var, maybeMoveBuildType( decl_node ) ); } Expression *build_tuple( ExpressionNode * expr_node ) { TupleExpr *ret = new TupleExpr(); - buildList( expr_node, ret->get_exprs() ); + buildMoveList( expr_node, ret->get_exprs() ); return ret; } Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node ) { - std::list args; - - buildList( expr_node, args ); - return new UntypedExpr( maybeBuild(function), args, nullptr ); + std::list< Expression * > args; + buildMoveList( expr_node, args ); + return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr ); } Expression *build_range( ExpressionNode * low, ExpressionNode *high ) { - Expression *low_cexpr = maybeBuild( low ); - Expression *high_cexpr = maybeBuild( high ); - return new RangeExpr( low_cexpr, high_cexpr ); -} - -//############################################################################## - -Expression *build_asm( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ) { - return new AsmExpr( maybeBuild< Expression >( inout ), constraint, maybeBuild(operand) ); -} - -//############################################################################## - -void LabelNode::print( std::ostream &os, int indent ) const {} - -void LabelNode::printOneLine( std::ostream &os, int indent ) const {} - -//############################################################################## + return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) ); +} + +Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ) { + return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) ); +} Expression *build_valexpr( StatementNode *s ) { - return new UntypedValofExpr( maybeBuild(s), nullptr ); -} - -//############################################################################## - -// ForCtlExprNode::ForCtlExprNode( ParseNode *init_, ExpressionNode *cond, ExpressionNode *incr ) throw ( SemanticError ) : condition( cond ), change( incr ) { -// if ( init_ == 0 ) -// init = 0; -// else { -// DeclarationNode *decl; -// ExpressionNode *exp; - -// if (( decl = dynamic_cast(init_) ) != 0) -// init = new StatementNode( decl ); -// else if (( exp = dynamic_cast( init_)) != 0) -// init = new StatementNode( StatementNode::Exp, exp ); -// else -// throw SemanticError("Error in for control expression"); -// } -// } - -// ForCtlExprNode::ForCtlExprNode( const ForCtlExprNode &other ) -// : ExpressionNode( other ), init( maybeClone( other.init ) ), condition( maybeClone( other.condition ) ), change( maybeClone( other.change ) ) { -// } - -// ForCtlExprNode::~ForCtlExprNode() { -// delete init; -// delete condition; -// delete change; -// } - -// Expression *ForCtlExprNode::build() const { -// // this shouldn't be used! -// assert( false ); -// return 0; -// } - -// void ForCtlExprNode::print( std::ostream &os, int indent ) const{ -// os << string( indent,' ' ) << "For Control Expression -- :" << endl; - -// os << string( indent + 2, ' ' ) << "initialization:" << endl; -// if ( init != 0 ) -// init->printList( os, indent + 4 ); - -// os << string( indent + 2, ' ' ) << "condition: " << endl; -// if ( condition != 0 ) -// condition->print( os, indent + 4 ); -// os << string( indent + 2, ' ' ) << "increment: " << endl; -// if ( change != 0 ) -// change->print( os, indent + 4 ); -// } - -// void ForCtlExprNode::printOneLine( std::ostream &, int indent ) const { -// assert( false ); -// } - -//############################################################################## - + return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr ); +} Expression *build_typevalue( DeclarationNode *decl ) { - return new TypeExpr( decl->buildType() ); -} - -//############################################################################## + return new TypeExpr( maybeMoveBuildType( decl ) ); +} Expression *build_compoundLiteral( DeclarationNode *decl_node, InitializerNode *kids ) { - Declaration * newDecl = maybeBuild(decl_node); // compound literal type + Declaration * newDecl = maybeBuild< Declaration >(decl_node); // compound literal type if ( DeclarationWithType * newDeclWithType = dynamic_cast< DeclarationWithType * >( newDecl ) ) { // non-sue compound-literal type - return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeBuild(kids) ); + return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeMoveBuild< Initializer >(kids) ); // these types do not have associated type information } else if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( newDecl ) ) { - return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeBuild(kids) ); + return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeMoveBuild< Initializer >(kids) ); } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( newDecl ) ) { - return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeBuild(kids) ); + return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeMoveBuild< Initializer >(kids) ); } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( newDecl ) ) { - return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeBuild(kids) ); + return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeMoveBuild< Initializer >(kids) ); } else { assert( false ); Index: src/Parser/InitializerNode.cc =================================================================== --- src/Parser/InitializerNode.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/InitializerNode.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:20:24 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jul 4 15:37:15 2016 -// Update Count : 15 +// Last Modified On : Mon Aug 15 18:27:02 2016 +// Update Count : 20 // @@ -25,8 +25,8 @@ : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( aggrp ) - kids = dynamic_cast< InitializerNode *>( get_link() ); + kids = dynamic_cast< InitializerNode * >( get_next() ); if ( kids != 0 ) - set_link( 0 ); + set_last( 0 ); } @@ -34,8 +34,8 @@ : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( init != 0 ) - set_link(init); + set_last( init ); if ( aggrp ) - kids = dynamic_cast< InitializerNode *>( get_link() ); + kids = dynamic_cast< InitializerNode * >( get_next() ); if ( kids != 0 ) @@ -45,4 +45,6 @@ InitializerNode::~InitializerNode() { delete expr; + delete designator; + delete kids; } @@ -58,5 +60,5 @@ while ( curdes != 0) { curdes->printOneLine(os); - curdes = (ExpressionNode *)(curdes->get_link()); + curdes = (ExpressionNode *)(curdes->get_next()); if ( curdes ) os << ", "; } // while @@ -72,5 +74,5 @@ InitializerNode *moreInit; - if ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) ) + if ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) ) moreInit->printOneLine( os ); } @@ -82,22 +84,22 @@ //assert( next_init() != 0 ); - std::list< Initializer *> initlist; - buildList( next_init(), initlist ); + std::list< Initializer * > initlist; + buildList< Initializer, InitializerNode >( next_init(), initlist ); - std::list< Expression *> designlist; + std::list< Expression * > designlist; if ( designator != 0 ) { - buildList( designator, designlist ); + buildList< Expression, ExpressionNode >( designator, designlist ); } // if return new ListInit( initlist, designlist, maybeConstructed ); } else { - std::list< Expression *> designators; + std::list< Expression * > designators; if ( designator != 0 ) - buildList( designator, designators ); + buildList< Expression, ExpressionNode >( designator, designators ); if ( get_expression() != 0) - return new SingleInit( maybeBuild( get_expression() ), designators, maybeConstructed ); + return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed ); } // if Index: src/Parser/LinkageSpec.cc =================================================================== --- src/Parser/LinkageSpec.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/LinkageSpec.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -5,12 +5,12 @@ // file "LICENCE" distributed with Cforall. // -// LinkageSpec.cc -- -// +// LinkageSpec.cc -- +// // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:22:09 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Aug 19 15:53:05 2015 -// Update Count : 5 -// +// Last Modified By : Peter A. Buhr +// Last Modified On : Sun Aug 21 12:32:53 2016 +// Update Count : 17 +// #include @@ -20,90 +20,57 @@ #include "Common/SemanticError.h" -LinkageSpec::Type LinkageSpec::fromString( const std::string &stringSpec ) { - if ( stringSpec == "\"Cforall\"" ) { +LinkageSpec::Spec LinkageSpec::fromString( const std::string &spec ) { + if ( spec == "\"Cforall\"" ) { return Cforall; - } else if ( stringSpec == "\"C\"" ) { + } else if ( spec == "\"C\"" ) { return C; } else { - throw SemanticError( "Invalid linkage specifier " + stringSpec ); - } + throw SemanticError( "Invalid linkage specifier " + spec ); + } // if + delete &spec; // allocated by lexer } -std::string LinkageSpec::toString( LinkageSpec::Type linkage ) { - switch ( linkage ) { - case Intrinsic: - return "intrinsic"; - case Cforall: - return "Cforall"; - case C: - return "C"; - case AutoGen: - return "automatically generated"; - case Compiler: - return "compiler built-in"; - } - assert( false ); - return ""; +std::string LinkageSpec::toString( LinkageSpec::Spec linkage ) { + assert( linkage >= 0 && linkage < LinkageSpec::NoOfSpecs ); + static const char *linkageKinds[LinkageSpec::NoOfSpecs] = { + "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in", + }; + return linkageKinds[linkage]; } -bool LinkageSpec::isDecoratable( Type t ) { - switch ( t ) { - case Intrinsic: - case Cforall: - case AutoGen: - return true; - case C: - case Compiler: - return false; - } - assert( false ); - return false; +bool LinkageSpec::isDecoratable( Spec spec ) { + assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); + static bool decoratable[LinkageSpec::NoOfSpecs] = { + // Intrinsic, Cforall, C, AutoGen, Compiler + true, true, false, true, false, + }; + return decoratable[spec]; } -bool LinkageSpec::isGeneratable( Type t ) { - switch ( t ) { - case Intrinsic: - case Cforall: - case AutoGen: - case C: - return true; - case Compiler: - return false; - } - assert( false ); - return false; +bool LinkageSpec::isGeneratable( Spec spec ) { + assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); + static bool generatable[LinkageSpec::NoOfSpecs] = { + // Intrinsic, Cforall, C, AutoGen, Compiler + true, true, true, true, false, + }; + return generatable[spec]; } -bool LinkageSpec::isOverloadable( Type t ) { - return isDecoratable( t ); +bool LinkageSpec::isOverridable( Spec spec ) { + assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); + static bool overridable[LinkageSpec::NoOfSpecs] = { + // Intrinsic, Cforall, C, AutoGen, Compiler + true, false, false, true, false, + }; + return overridable[spec]; } - -bool LinkageSpec::isOverridable( Type t ) { - switch ( t ) { - case Intrinsic: - case AutoGen: - return true; - case Cforall: - case C: - case Compiler: - return false; - } - assert( false ); - return false; -} - -bool LinkageSpec::isBuiltin( Type t ) { - switch ( t ) { - case Cforall: - case AutoGen: - case C: - return false; - case Intrinsic: - case Compiler: - return true; - } - assert( false ); - return false; +bool LinkageSpec::isBuiltin( Spec spec ) { + assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); + static bool builtin[LinkageSpec::NoOfSpecs] = { + // Intrinsic, Cforall, C, AutoGen, Compiler + true, false, false, false, true, + }; + return builtin[spec]; } Index: src/Parser/LinkageSpec.h =================================================================== --- src/Parser/LinkageSpec.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/LinkageSpec.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:24:28 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Tue Aug 18 14:11:55 2015 -// Update Count : 5 +// Last Modified By : Peter A. Buhr +// Last Modified On : Sat Aug 20 19:22:23 2016 +// Update Count : 8 // @@ -20,20 +20,20 @@ struct LinkageSpec { - enum Type { + enum Spec { Intrinsic, // C built-in defined in prelude Cforall, // ordinary C, // not overloadable, not mangled AutoGen, // built by translator (struct assignment) - Compiler // gcc internal + Compiler, // gcc internal + NoOfSpecs }; - static Type fromString( const std::string & ); - static std::string toString( Type ); + static Spec fromString( const std::string & ); + static std::string toString( Spec ); - static bool isDecoratable( Type ); - static bool isGeneratable( Type ); - static bool isOverloadable( Type ); - static bool isOverridable( Type ); - static bool isBuiltin( Type ); + static bool isDecoratable( Spec ); + static bool isGeneratable( Spec ); + static bool isOverridable( Spec ); + static bool isBuiltin( Spec ); }; Index: src/Parser/ParseNode.cc =================================================================== --- src/Parser/ParseNode.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/ParseNode.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:26:29 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Aug 7 23:32:47 2016 -// Update Count : 94 +// Last Modified On : Wed Aug 17 23:14:16 2016 +// Update Count : 126 // @@ -17,52 +17,5 @@ using namespace std; -// Builder int ParseNode::indent_by = 4; - -ParseNode::ParseNode() : next( 0 ) {}; -ParseNode::ParseNode( const string *name ) : name( *name ), next( 0 ) { delete name; } -ParseNode::ParseNode( const string &name ) : name( name ), next( 0 ) { } - -ParseNode::~ParseNode() { - delete next; -}; - -ParseNode *ParseNode::get_last() { - ParseNode *current = this; - - while ( current->get_link() != 0 ) - current = current->get_link(); - - return current; -} - -ParseNode *ParseNode::set_link( ParseNode *next_ ) { - if ( next_ != 0 ) get_last()->next = next_; - return this; -} - -void ParseNode::print( std::ostream &os, int indent ) const {} - - -void ParseNode::printList( std::ostream &os, int indent ) const { - print( os, indent ); - - if ( next ) { - next->printList( os, indent ); - } // if -} - -ParseNode &ParseNode::operator,( ParseNode &p ) { - set_link( &p ); - - return *this; -} - -ParseNode *mkList( ParseNode &pn ) { - // it just relies on `operator,' to take care of the "arguments" and provides a nice interface to an awful-looking - // address-of, rendering, for example (StatementNode *)(&(*$5 + *$7)) into (StatementNode *)mkList(($5, $7)) - // (although "nice" is probably not the word) - return &pn; -} // Local Variables: // Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/ParseNode.h (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 11 12:24:11 2016 -// Update Count : 443 +// Last Modified On : Sun Aug 28 21:14:51 2016 +// Update Count : 575 // @@ -22,12 +22,11 @@ #include -#include "Common/utility.h" #include "Parser/LinkageSpec.h" #include "SynTree/Type.h" #include "SynTree/Expression.h" #include "SynTree/Statement.h" -//#include "SynTree/Declaration.h" +#include "SynTree/Label.h" +#include "Common/utility.h" #include "Common/UniqueName.h" -#include "SynTree/Label.h" class StatementNode; @@ -37,33 +36,37 @@ class InitializerNode; -// Builder +//############################################################################## + class ParseNode { public: - ParseNode(); - ParseNode( const std::string * ); - ParseNode( const std::string & ); // for copy constructing subclasses - virtual ~ParseNode(); - - ParseNode *get_link() const { return next; } - ParseNode *get_last(); - ParseNode *set_link( ParseNode * ); - void set_next( ParseNode *newlink ) { next = newlink; } - - virtual ParseNode *clone() const { return 0; }; + ParseNode() {}; + ParseNode( const std::string *name ) : name( *name ) { assert( false ); delete name; } + ParseNode( const std::string &name ) : name( name ) { assert( false ); } + virtual ~ParseNode() { delete next; }; + virtual ParseNode *clone() const = 0; + + ParseNode *get_next() const { return next; } + ParseNode *set_next( ParseNode *newlink ) { next = newlink; return this; } + ParseNode *get_last() { + ParseNode *current; + for ( current = this; current->get_next() != 0; current = current->get_next() ); + return current; + } + ParseNode *set_last( ParseNode *newlast ) { + if ( newlast != 0 ) get_last()->set_next( newlast ); + return this; + } const std::string &get_name() const { return name; } void set_name( const std::string &newValue ) { name = newValue; } - virtual void print( std::ostream &os, int indent = 0 ) const; - virtual void printList( std::ostream &os, int indent = 0 ) const; - - ParseNode &operator,( ParseNode & ); - protected: + virtual void print( std::ostream &os, int indent = 0 ) const {} + virtual void printList( std::ostream &os, int indent = 0 ) const {} + private: + static int indent_by; + + ParseNode *next = nullptr; std::string name; - static int indent_by; - ParseNode *next; -}; - -ParseNode *mkList( ParseNode & ); +}; // ParseNode //############################################################################## @@ -74,4 +77,5 @@ InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode *des = 0 ); ~InitializerNode(); + virtual InitializerNode *clone() const { assert( false ); return nullptr; } ExpressionNode *get_expression() const { return expr; } @@ -92,12 +96,12 @@ ExpressionNode *expr; bool aggregate; - ExpressionNode *designator; // may be list + ExpressionNode *designator; // may be list InitializerNode *kids; bool maybeConstructed; -}; - -//############################################################################## - -class ExpressionNode : public ParseNode { +}; // InitializerNode + +//############################################################################## + +class ExpressionNode final : public ParseNode { public: ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {} @@ -105,21 +109,25 @@ ExpressionNode( const ExpressionNode &other ); virtual ~ExpressionNode() {} - - virtual ExpressionNode *clone() const { return 0; } + virtual ExpressionNode *clone() const { return expr ? new ExpressionNode( expr->clone() ) : nullptr; } bool get_extension() const { return extension; } ExpressionNode *set_extension( bool exten ) { extension = exten; return this; } - virtual void print( std::ostream &os, int indent = 0 ) const {} - virtual void printOneLine( std::ostream &os, int indent = 0 ) const {} - - virtual Expression *build() const { return expr; } + void print( std::ostream &os, int indent = 0 ) const {} + void printOneLine( std::ostream &os, int indent = 0 ) const {} + + template + bool isExpressionType() const { + return nullptr != dynamic_cast(expr.get()); + } + + Expression *build() const { return const_cast(this)->expr.release(); } private: bool extension = false; - Expression *expr; -}; + std::unique_ptr expr; +}; // ExpressionNode template< typename T > -struct maybeBuild_t { +struct maybeBuild_t< Expression, T > { static inline Expression * doit( const T *orig ) { if ( orig ) { @@ -128,25 +136,8 @@ return p; } else { - return 0; + return nullptr; } // if } }; - -//############################################################################## - -Expression *build_constantInteger( std::string &str ); -Expression *build_constantFloat( std::string &str ); -Expression *build_constantChar( std::string &str ); -ConstantExpr *build_constantStr( std::string &str ); - -//############################################################################## - -NameExpr *build_varref( const std::string *name, bool labelp = false ); - -//############################################################################## - -Expression *build_typevalue( DeclarationNode *decl ); - -//############################################################################## enum class OperKinds { @@ -154,10 +145,22 @@ SizeOf, AlignOf, OffsetOf, Plus, Minus, Mul, Div, Mod, Or, And, BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, - Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn, + Assign, AtAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn, Index, Range, // monadic UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress, Ctor, Dtor, +}; // OperKinds + +struct LabelNode { + std::list< Label > labels; }; + +Expression *build_constantInteger( const std::string &str ); +Expression *build_constantFloat( const std::string &str ); +Expression *build_constantChar( const std::string &str ); +ConstantExpr *build_constantStr( const std::string &str ); + +NameExpr *build_varref( const std::string *name, bool labelp = false ); +Expression *build_typevalue( DeclarationNode *decl ); Expression *build_cast( DeclarationNode * decl_node, ExpressionNode *expr_node ); @@ -183,31 +186,6 @@ Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node ); Expression *build_range( ExpressionNode * low, ExpressionNode *high ); - -//############################################################################## - -Expression *build_asm( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ); - -//############################################################################## - -class LabelNode : public ExpressionNode { - public: - virtual Expression *build() const { return NULL; } - virtual LabelNode *clone() const { assert( false ); return new LabelNode( *this ); } - - virtual void print( std::ostream &os, int indent = 0) const; - virtual void printOneLine( std::ostream &os, int indent = 0) const; - - const std::list< Label > &get_labels() const { return labels; }; - void append_label( std::string * label ) { labels.push_back( *label ); delete label; } - private: - std::list< Label > labels; -}; - -//############################################################################## - +Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ); Expression *build_valexpr( StatementNode *s ); - -//############################################################################## - Expression *build_compoundLiteral( DeclarationNode *decl_node, InitializerNode *kids ); @@ -218,5 +196,5 @@ class DeclarationNode : public ParseNode { public: - enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic }; + enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoOfQualifier }; enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, }; enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary }; @@ -226,6 +204,6 @@ enum BuiltinType { Valist }; + static const char *qualifierName[]; static const char *storageName[]; - static const char *qualifierName[]; static const char *basicTypeName[]; static const char *modifierName[]; @@ -236,8 +214,9 @@ static DeclarationNode *newFunction( std::string *name, DeclarationNode *ret, DeclarationNode *param, StatementNode *body, bool newStyle = false ); static DeclarationNode *newQualifier( Qualifier ); + static DeclarationNode *newForall( DeclarationNode *); static DeclarationNode *newStorageClass( StorageClass ); static DeclarationNode *newBasicType( BasicType ); static DeclarationNode *newModifier( Modifier ); - static DeclarationNode *newForall( DeclarationNode *); + static DeclarationNode *newBuiltinType( BuiltinType ); static DeclarationNode *newFromTypedef( std::string *); static DeclarationNode *newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body ); @@ -258,7 +237,11 @@ static DeclarationNode *newAttr( std::string *, ExpressionNode *expr ); static DeclarationNode *newAttr( std::string *, DeclarationNode *type ); - static DeclarationNode *newBuiltinType( BuiltinType ); + + DeclarationNode(); + ~DeclarationNode(); + DeclarationNode *clone() const; DeclarationNode *addQualifiers( DeclarationNode *); + void checkQualifiers( const TypeData *, const TypeData * ); DeclarationNode *copyStorageClasses( DeclarationNode *); DeclarationNode *addType( DeclarationNode *); @@ -275,5 +258,5 @@ DeclarationNode *addNewArray( DeclarationNode *array ); DeclarationNode *addParamList( DeclarationNode *list ); - DeclarationNode *addIdList( DeclarationNode *list ); // old-style functions + DeclarationNode *addIdList( DeclarationNode *list ); // old-style functions DeclarationNode *addInitializer( InitializerNode *init ); @@ -284,7 +267,8 @@ DeclarationNode *cloneBaseType( DeclarationNode *newdecl ); - DeclarationNode *appendList( DeclarationNode * ); - - DeclarationNode *clone() const; + DeclarationNode *appendList( DeclarationNode *node ) { + return (DeclarationNode *)set_last( node ); + } + void print( std::ostream &os, int indent = 0 ) const; void printList( std::ostream &os, int indent = 0 ) const; @@ -295,27 +279,28 @@ bool get_hasEllipsis() const; const std::string &get_name() const { return name; } - LinkageSpec::Type get_linkage() const { return linkage; } + LinkageSpec::Spec get_linkage() const { return linkage; } DeclarationNode *extractAggregate() const; - ExpressionNode *get_enumeratorValue() const { return enumeratorValue; } + bool has_enumeratorValue() const { return (bool)enumeratorValue; } + ExpressionNode *consume_enumeratorValue() const { return const_cast(this)->enumeratorValue.release(); } bool get_extension() const { return extension; } DeclarationNode *set_extension( bool exten ) { extension = exten; return this; } - - DeclarationNode(); - ~DeclarationNode(); - private: - StorageClass buildStorageClass() const; - bool buildFuncSpecifier( StorageClass key ) const; + public: + // StorageClass buildStorageClass() const; + // bool buildFuncSpecifier( StorageClass key ) const; TypeData *type; std::string name; - std::list< StorageClass > storageClasses; + // std::list< StorageClass > storageClasses; + StorageClass storageClass; + bool isInline, isNoreturn; std::list< std::string > attributes; ExpressionNode *bitfieldWidth; - ExpressionNode *enumeratorValue; + std::unique_ptr enumeratorValue; InitializerNode *initializer; bool hasEllipsis; - LinkageSpec::Type linkage; + LinkageSpec::Spec linkage; bool extension = false; + std::string error; static UniqueName anonymous; @@ -323,85 +308,43 @@ Type *buildType( TypeData *type ); - -//############################################################################## - -class StatementNode : public ParseNode { - public: - enum Type { Exp, If, Switch, Case, Default, Choose, Fallthru, - While, Do, For, - Goto, Continue, Break, Return, Throw, - Try, Catch, Finally, Asm, - Decl - }; - - StatementNode(); - StatementNode( const std::string *name ); - StatementNode( Type t, ExpressionNode *control = 0, StatementNode *block = 0 ); - StatementNode( Type t, std::string *target ); +//Type::Qualifiers buildQualifiers( const TypeData::Qualifiers & qualifiers ); + +static inline Type * maybeMoveBuildType( const DeclarationNode *orig ) { + Type* ret = orig ? orig->buildType() : nullptr; + delete orig; + return ret; +} + +//############################################################################## + +class StatementNode final : public ParseNode { + public: + StatementNode() { stmt = nullptr; } + StatementNode( Statement *stmt ) : stmt( stmt ) {} StatementNode( DeclarationNode *decl ); - - ~StatementNode(); - - static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false ); - - StatementNode *set_block( StatementNode *b ) { block = b; return this; } - StatementNode *get_block() const { return block; } - - void set_control( ExpressionNode *c ) { control = c; } - ExpressionNode *get_control() const { return control; } - - StatementNode::Type get_type() const { return type; } - - virtual StatementNode *add_label( const std::string * ); - virtual std::list get_labels() const { return labels; } - - void addDeclaration( DeclarationNode *newDecl ) { decl = newDecl; } - void setCatchRest( bool newVal ) { isCatchRest = newVal; } - - std::string get_target() const; - - // StatementNode *add_controlexp( ExpressionNode * ); - StatementNode *append_block( StatementNode * ); + virtual ~StatementNode() {} + + virtual StatementNode *clone() const final { assert( false ); return nullptr; } + Statement *build() const { return const_cast(this)->stmt.release(); } + + virtual StatementNode *add_label( const std::string * name ) { + stmt->get_labels().emplace_back( *name ); + delete name; + return this; + } + virtual StatementNode *append_last_case( StatementNode * ); - - void print( std::ostream &os, int indent = 0) const; - virtual StatementNode *clone() const; - virtual Statement *build() const; - private: - static const char *StType[]; - Type type; - ExpressionNode *control; - StatementNode *block; - std::list labels; - std::string *target; // target label for jump statements - DeclarationNode *decl; - bool isCatchRest; -}; // StatementNode - -class StatementNode2 : public StatementNode { - public: - StatementNode2() {} - StatementNode2( Statement *stmt ) : stmt( stmt ) {} - virtual ~StatementNode2() {} - - virtual StatementNode2 *clone() const { assert( false ); return nullptr; } - virtual Statement *build() const { return stmt; } - - virtual StatementNode2 *add_label( const std::string * name ) { - stmt->get_labels().emplace_back( *name ); - return this; - } - virtual StatementNode *append_last_case( StatementNode * ); - virtual std::list get_labels() const { assert( false ); return StatementNode::get_labels(); } virtual void print( std::ostream &os, int indent = 0 ) {} virtual void printList( std::ostream &os, int indent = 0 ) {} private: - Statement *stmt; + std::unique_ptr stmt; }; // StatementNode + +Statement *build_expr( ExpressionNode *ctl ); struct ForCtl { ForCtl( ExpressionNode *expr, ExpressionNode *condition, ExpressionNode *change ) : - init( new StatementNode( StatementNode::Exp, expr ) ), condition( condition ), change( change ) {} + init( new StatementNode( build_expr( expr ) ) ), condition( condition ), change( change ) {} ForCtl( DeclarationNode *decl, ExpressionNode *condition, ExpressionNode *change ) : init( new StatementNode( decl ) ), condition( condition ), change( change ) {} @@ -412,5 +355,4 @@ }; -Statement *build_expr( ExpressionNode *ctl ); Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ); Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ); @@ -419,42 +361,14 @@ Statement *build_while( ExpressionNode *ctl, StatementNode *stmt, bool kind = false ); Statement *build_for( ForCtl *forctl, StatementNode *stmt ); -Statement *build_branch( std::string identifier, BranchStmt::Type kind ); +Statement *build_branch( BranchStmt::Type kind ); +Statement *build_branch( std::string *identifier, BranchStmt::Type kind ); Statement *build_computedgoto( ExpressionNode *ctl ); Statement *build_return( ExpressionNode *ctl ); Statement *build_throw( ExpressionNode *ctl ); - -//############################################################################## - -class CompoundStmtNode : public StatementNode { - public: - CompoundStmtNode(); - CompoundStmtNode( const std::string * ); - CompoundStmtNode( StatementNode * ); - ~CompoundStmtNode(); - - void add_statement( StatementNode * ); - - void print( std::ostream &os, int indent = 0 ) const; - virtual Statement *build() const; - private: - StatementNode *first, *last; -}; - -//############################################################################## - -class AsmStmtNode : public StatementNode { - public: - AsmStmtNode( Type, bool voltile, ConstantExpr *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ExpressionNode *clobber = 0, LabelNode *gotolabels = 0 ); - ~AsmStmtNode(); - - void print( std::ostream &os, int indent = 0 ) const; - Statement *build() const; - private: - bool voltile; - ConstantExpr *instruction; - ExpressionNode *output, *input; - ExpressionNode *clobber; - std::list< Label > gotolabels; -}; +Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ); +Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny = false ); +Statement *build_finally( StatementNode *stmt ); +Statement *build_compound( StatementNode *first ); +Statement *build_asmstmt( bool voltile, ConstantExpr *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ExpressionNode *clobber = 0, LabelNode *gotolabels = 0 ); //############################################################################## @@ -463,11 +377,11 @@ void buildList( const NodeType *firstNode, std::list< SynTreeType * > &outputList ) { SemanticError errors; - std::back_insert_iterator< std::list< SynTreeType *> > out( outputList ); + std::back_insert_iterator< std::list< SynTreeType * > > out( outputList ); const NodeType *cur = firstNode; while ( cur ) { try { -// SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuild::type>( cur ) ); - SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuildbuild())>::element_type>( cur ) ); +// SynTreeType *result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::result_of< decltype(&NodeType::build)(NodeType)>::type >( cur ) ); + SynTreeType *result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::pointer_traits< decltype(cur->build())>::element_type >( cur ) ); if ( result ) { *out++ = result; @@ -477,5 +391,5 @@ errors.append( e ); } // try - cur = dynamic_cast< NodeType *>( cur->get_link() ); + cur = dynamic_cast< NodeType * >( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -486,6 +400,13 @@ // in DeclarationNode.cc void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList ); -void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList ); +void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList ); void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList ); + +template< typename SynTreeType, typename NodeType > +void buildMoveList( const NodeType *firstNode, std::list< SynTreeType * > &outputList ) { + buildList(firstNode, outputList); + delete firstNode; +} + #endif // PARSENODE_H Index: c/Parser/Parser.cc =================================================================== --- src/Parser/Parser.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ (revision ) @@ -1,70 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// Parser.cc -- -// -// Author : Rodolfo G. Esteves -// Created On : Sat May 16 14:54:28 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Mar 21 18:04:47 2016 -// Update Count : 5 -// - -#include "Parser.h" -#include "lex.h" -#include "parser.h" -#include "TypedefTable.h" - -// global variables in cfa.y -extern int yyparse(void); -extern int yydebug; -extern LinkageSpec::Type linkage; -extern TypedefTable typedefTable; -extern DeclarationNode *theTree; - -Parser *Parser::theParser = 0; - -Parser::Parser(): parseTree( 0 ), parseStatus( 1 ) {} - -Parser::~Parser() { - delete parseTree; -} - -Parser &Parser::get_parser() { - if ( theParser == 0 ) { - theParser = new Parser; - } // if - return *theParser; -} - -void Parser::parse( FILE *input ) { - extern FILE *yyin; - yyin = input; - extern int yylineno; - yylineno = 1; - typedefTable.enterScope(); - parseStatus = yyparse(); - parseTree = theTree; -} - -void Parser::set_debug( bool debug ) { - yydebug = debug; -} - -void Parser::set_linkage( LinkageSpec::Type linkage ) { - ::linkage = linkage; -} - -void Parser::freeTree() { - delete parseTree; - parseTree = 0; -} - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: c/Parser/Parser.h =================================================================== --- src/Parser/Parser.h (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ (revision ) @@ -1,56 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// Parser.h -- -// -// Author : Rodolfo G. Esteves -// Created On : Sat May 16 14:56:50 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat May 16 14:58:56 2015 -// Update Count : 2 -// - -#ifndef PARSER_H -#define PARSER_H - -#include - -#include "Parser/ParseNode.h" -#include "LinkageSpec.h" - -class Parser { - public: - static Parser &get_parser(); - - // do the actual parse - void parse( FILE *input ); - - // accessors to return the result of the parse - DeclarationNode *get_parseTree() const { return parseTree; } - int get_parseStatus() const { return parseStatus; } - - // mutators to control parse options - void set_debug( bool debug ); - void set_linkage( LinkageSpec::Type linkage ); - - // free the parse tree without actually destroying the parser - void freeTree(); - - ~Parser(); - private: - Parser(); - static Parser *theParser; - DeclarationNode *parseTree; - int parseStatus; -}; - -#endif // PARSER_H - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/Parser/StatementNode.cc =================================================================== --- src/Parser/StatementNode.cc (revision 79841be91c84428055cbee2c6670f4b434b5edd6) +++ src/Parser/StatementNode.cc (revision 6943a9871116ec46c4e36b597cc04f17cd4d347e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 14:59:41 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 11 16:19:45 2016 -// Update Count : 210 +// Last Modified On : Sun Aug 21 11:59:37 2016 +// Update Count : 325 // @@ -26,315 +26,48 @@ using namespace std; -const char *StatementNode::StType[] = { - "Exp", "If", "Switch", "Case", "Default", "Choose", "Fallthru", - "While", "Do", "For", - "Goto", "Continue", "Break", "Return", "Throw", - "Try", "Catch", "Finally", "Asm", - "Decl" -}; - -StatementNode::StatementNode() : ParseNode(), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {} - -StatementNode::StatementNode( const string *name ) : ParseNode( name ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {} - -StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), isCatchRest ( false ) { + +StatementNode::StatementNode( DeclarationNode *decl ) { if ( decl ) { - if ( DeclarationNode *agg = decl->extractAggregate() ) { - this->decl = agg; - StatementNode *nextStmt = new StatementNode; - nextStmt->type = Decl; - nextStmt->decl = decl; - next = nextStmt; - if ( decl->get_link() ) { - next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) ); + DeclarationNode *agg = decl->extractAggregate(); + if ( agg ) { + StatementNode *nextStmt = new StatementNode( new DeclStmt( noLabels, maybeBuild< Declaration >( decl ) ) ); + set_next( nextStmt ); + if ( decl->get_next() ) { + get_next()->set_next( new StatementNode( dynamic_cast< DeclarationNode * >(decl->get_next()) ) ); decl->set_next( 0 ); } // if } else { - if ( decl->get_link() ) { - next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ); + if ( decl->get_next() ) { + set_next(new StatementNode( dynamic_cast< DeclarationNode * >( decl->get_next() ) ) ); decl->set_next( 0 ); } // if - this->decl = decl; + agg = decl; } // if + stmt.reset( new DeclStmt( noLabels, maybeMoveBuild< Declaration >(agg) ) ); + } else { + assert( false ); } // if } -StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) { - this->control = ( t == Default ) ? 0 : control; -} - -StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {} - -StatementNode::~StatementNode() { - delete control; - delete block; - delete target; - delete decl; -} - -StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) { - StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s ); - ret->addDeclaration( d ); - ret->setCatchRest( catchRestP ); - - return ret; -} - -std::string StatementNode::get_target() const{ - if ( target ) - return *target; - - return string(""); -} - -StatementNode * StatementNode::clone() const { - StatementNode *newnode = new StatementNode( type, maybeClone( control ), maybeClone( block ) ); - if ( target ) { - newnode->target = new string( *target ); - } else { - newnode->target = 0; - } // if - newnode->decl = maybeClone( decl ); - return newnode; -} - -StatementNode *StatementNode::add_label( const std::string *l ) { - if ( l != 0 ) { - labels.push_front( *l ); - delete l; - } // if - return this; -} - -StatementNode *StatementNode::append_block( StatementNode *stmt ) { - if ( stmt != 0 ) { - if ( block == 0 ) - block = stmt; - else - block->set_link( stmt ); - } // if - return this; -} - StatementNode *StatementNode::append_last_case( StatementNode *stmt ) { - assert( false ); - if ( stmt != 0 ) { - StatementNode *next = ( StatementNode *)get_link(); - if ( next && ( next->get_type() == StatementNode::Case || next->get_type() == StatementNode::Default ) ) - next->append_last_case( stmt ); - else - if ( block == 0 ) - block = stmt; - else - block->set_link( stmt ); - } // if - return this; -} - -StatementNode *StatementNode2::append_last_case( StatementNode *stmt ) { StatementNode *prev = this; - for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_link() ) { - StatementNode2 *node = dynamic_cast(curr); - assert( node ); - assert( dynamic_cast(node->stmt) ); + // find end of list and maintain previous pointer + for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) { + StatementNode *node = safe_dynamic_cast< StatementNode * >(curr); + assert( dynamic_cast< CaseStmt * >(node->stmt.get()) ); prev = curr; } // for - StatementNode2 *node = dynamic_cast(prev); - std::list stmts; - buildList( stmt, stmts ); - CaseStmt * caseStmt; - caseStmt = dynamic_cast(node->stmt); + // convert from StatementNode list to Statement list + StatementNode *node = dynamic_cast< StatementNode * >(prev); + std::list< Statement * > stmts; + buildMoveList( stmt, stmts ); + // splice any new Statements to end of current Statements + CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt.get()); caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts ); return this; } -void StatementNode::print( std::ostream &os, int indent ) const { - if ( ! labels.empty() ) { - std::list::const_iterator i; - - os << string( indent, ' ' ); - for ( i = labels.begin(); i != labels.end(); i++ ) - os << *i << ":"; - os << endl; - } // if - - switch ( type ) { - case Decl: - decl->print( os, indent ); - break; - case Exp: - if ( control ) { - os << string( indent, ' ' ); - control->print( os, indent ); - os << endl; - } else - os << string( indent, ' ' ) << "Null Statement" << endl; - break; - default: - os << string( indent, ' ' ) << StatementNode::StType[type] << endl; - if ( type == Catch ) { - if ( decl ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl; - decl->print( os, indent + 2 * ParseNode::indent_by ); - } else if ( isCatchRest ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl; - } else { - ; // should never reach here - } // if - } // if - if ( control ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Control: " << endl; - control->printList( os, indent + 2 * ParseNode::indent_by ); - } // if - if ( block ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Cases: " << endl; - block->printList( os, indent + 2 * ParseNode::indent_by ); - } // if - if ( target ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl; - } // if - break; - } // switch -} - -Statement *StatementNode::build() const { - std::list branches; - std::list exps; - std::list