Changeset 4c03e63 for doc

Timestamp:

Jun 23, 2017, 4:20:33 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

74e58ea3, 7bbba76

Parents:

e1c1829 (diff), 88177cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

doc

Files:

• LaTeXmacros/common.tex (modified) (3 diffs)
• proposals/tagged-struct.txt (modified) (3 diffs)
• rob_thesis/intro.tex (modified) (2 diffs)
• rob_thesis/thesis.tex (modified) (1 diff)
• working/exception/translate.c (modified) (7 diffs)

doc/LaTeXmacros/common.tex

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

doc/proposals/tagged-struct.txt

@@ -14 +14 @@
 say which of the possible values is currently stored in the union. The idea
 here is similar, however the possibilities are more open ended.
+
+Alternate names include virtual structure and abstract structure.
 
 
@@ -36 +38 @@
 their parent's fields to their field list so they can be upcast.
 
+The type field may be public, if it is then it can be accessed through a
+simple field access "instance.type". The type field would then be able to be
+used to access the type object, which contains the information for the type.
+It may just be a pointer to the type object "*instance.type", although a
+lookup function could also be used.
+
+
+Usage:
+
+The central feature for tagged structs is a checked cast between pointer types
+to the structures. A cast is successful if the true type of the pointed object
+is of the type being cast to or any of its children, otherwise the cast
+returns null.
+
+The type field should also allow for equality comparison of types.
+
+Currently, with only these operations (and similar features) the type field
+could be hidden and the operations given through helper functions. However
+if the type object has more complex (or even open ended) information in it
+than providing direct access becomes very valuable.
+
 
 Implemenation:
 
-Adding to the field list is a simple matter, should be doable during
-translation. The type field is just a pointer to a type object. With proper
-linking we can create a single unique instance of the type object for each
-declared tagged struct. The instance's address is used as an id for the type.
-It also holds data about the type, such as its parent's id/a pointer to the
-parent type object.
+Adding to the field list would have to be handled during translation. The
+simple act of adding declarations should not be difficult, althought it might
+take a bit of work to find the parent's declarations.
 
-The type field could be hidden (as best as C can hide it) or it could be
-visible to the user with easy access to allow the user to examine the type
-object directly.
-
-Direct access is more useful if the data on the type-objects can change, other
-wise the build in function could handle all cases. Perhaps each root object
-can specify a type object to use or the type objects are themselves tagged,
-although there may not be a base case with the latter.
-
-In the simplest case the type object is a pointer to the parent type object.
-Additional data could be added, such as a name, or a function pointer to the
-destructor.
+Type objects are also simple in to generate, they should just be global
+(program lifetime) structures. Getting there to be exactly one instance of
+each allows the pointer to the structure to be used as the type id, and that
+should be possible to do during linking.
 
 
@@ -94 +106 @@
 If unions are declared tagged instead of creating a new tagged type, all
 possible values of the union must be of that tagged type or a child type.
+
+
+Custom Type Objects (Extention):
+
+Some method to define type objects used within a tree of types. One option is
+to allow the tree's type object to be specified by the tree root. It would
+then have to be filled in for each type in the tree, including the root.
+
+The only required field is the parent field, a pointer to the type object's
+type. (This is also the only required field on the tagged structure itself.)
+
+A further extention could allow expanding type objects, so child types could
+append fields to their parent's feild list. They might need their own type
+objects at that point, or maybe static checks will be enough to see the
+minimum field list.

doc/rob_thesis/intro.tex

@@ -3 +3 @@
 %======================================================================
 
-\section{\CFA Background}
+\section{\protect\CFA Background}
 \label{s:background}
 \CFA \footnote{Pronounced ``C-for-all'', and written \CFA or Cforall.} is a modern non-object-oriented extension to the C programming language.
@@ -370 +370 @@
     \end{tabular}
   \end{center}
-  \caption{\label{table:types} The different kinds of type parameters in \CFA}
+  \caption{\label{table:types} The different kinds of type parameters in \protect\CFA}
 \end{table}
 

doc/rob_thesis/thesis.tex

@@ -66 +66 @@
 % ,monochrome % toggle black and white mode
 }{xcolor}
+\PassOptionsToPackage{pdftex}{graphicx}
 \documentclass[letterpaper,12pt,titlepage,oneside,final]{book}
 

doc/working/exception/translate.c

@@ -1 +1 @@
 /* Translation rules for exception handling code, from Cforall to C.
  *
- * Note that these are not final. Names, syntax and the exact translation
- * will be updated. The first section is the shared definitions, not generated
- * by the local translations but used by the translated code.
+ * Reminder: This is not final. Besides names and things it is also going very
+ * much for correctness and simplisity over efficiency.
+ *
+ * The first section is the shared definitions, not generated by the local
+ * translations but used by the translated code.
  *
  * Most of these exist only after translation (in C code). The first (the
@@ -16 +18 @@
 typedef int exception;
 
+// Will have to be availibe to user. Consider new name. Requires tagged types.
+forall(dtype parent | tagged(parent), dtype child | tagged(child))
+parent *dynamic_cast(child *);
+
 void __throw_terminate(exception except) __attribute__((noreturn));
 void __rethrow_terminate() __attribute__((noreturn));
@@ -116 +122 @@
                 }
                 int match1(exception except) {
-                        OtherException inner_except;
-                        if (dynamic_cast__SomeException(except)) {
-                                return 1;
-                        }
-                        else if ( (inner_except = dynamic_cast__OtherException(except)) &&
-                                        inner_except.priority > 3) {
-                                return 2;
-                        }
-                        else return 0;
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        return 1;
+                                }
+                        }
+                        {
+                                OtherException err;
+                                if ( (err = dynamic_cast__OtherException(except)) &&
+                                                err.priority > 3) {
+                                        return 2;
+                                }
+                        }
+                        return 0;
                 }
                 __try_terminate(try1, catch1, match1);
@@ -151 +161 @@
         {
                 bool handle1(exception except) {
-                        OtherException inner_except;
-                        if (dynamic_cast__SomeException(except)) {
-                                fiddleThing();
-                                return true;
-                        } else if (dynamic_cast__OtherException(except) &&
-                                        inner_except.priority > 3) {
-                                twiddleWidget();
-                                return true;
-                        } else {
-                                return false;
-                        }
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        fiddleThing();
+                                        return true;
+                                }
+                        }
+                        {
+                                OtherException err;
+                                if ( ( err = dynamic_cast__OtherException(except) ) &&
+                                                err.priority > 3) {
+                                        twiddleWidget();
+                                        return true;
+                                }
+                        }
+                        return false;
                 }
                 struct __try_resume_node data =
@@ -230 +244 @@
                 }
                 bool handle1(exception except) {
-                        if (dynamic_cast__SomeException(except)) {
-                                fiddleThing();
-                                return true;
-                        } else {
-                                return false;
-                        }
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        fiddleThing();
+                                        return true;
+                                }
+                        }
+                        return false;
                 }
                 struct __cleanup_hook generated_name
@@ -273 +288 @@
         {
                 bool handle1() {
-                        if (dynamic_cast__OtherException(except)) {
-                                twiddleWidget();
-                                return true;
+                        {
+                                if (dynamic_cast__OtherException(except)) {
+                                        twiddleWidget();
+                                        return true;
+                                }
                         }
                         return false;
@@ -297 +314 @@
                 }
                 int match1(exception except) {
-                        if (dynamic_cast__SomeException(except)) {
-                                return 1;
+                        {
+                                if (dynamic_cast__SomeException(except)) {
+                                        return 1;
+                                }
                         }
                         return 0;