Changes in / [fc276f3:4175659]

Files:

• libcfa/prelude/builtins.c (modified) (1 diff)
• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/enum.cfa (added)
• libcfa/src/enum.hfa (added)
• libcfa/src/iostream.cfa (modified) (1 diff)
• libcfa/src/iostream.hfa (modified) (1 diff)
• libcfa/src/rational.cfa (modified) (3 diffs)
• libcfa/src/rational.hfa (modified) (1 diff)
• src/AST/Decl.hpp (modified) (1 diff)
• src/AST/Expr.cpp (modified) (1 diff)
• src/Parser/TypeData.cpp (modified) (1 diff)
• tests/.expect/KRfunctions.arm64.txt (modified) (1 diff)
• tests/.expect/KRfunctions.x64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.arm64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x86.txt (modified) (1 diff)
• tests/.expect/extension.x64.txt (modified) (1 diff)
• tests/.expect/extension.x86.txt (modified) (1 diff)
• tests/.expect/gccExtensions.arm64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x64.txt (modified) (1 diff)
• tests/ctrl-flow/loopctrl.cfa (modified) (1 diff)
• tests/enum_tests/.expect/position.txt (modified) (1 diff)
• tests/enum_tests/anonymous.cfa (modified) (1 diff)
• tests/enum_tests/enumInlineValue.cfa (modified) (1 diff)
• tests/enum_tests/input.cfa (modified) (1 diff)
• tests/enum_tests/planet.cfa (modified) (1 diff)
• tests/enum_tests/position.cfa (modified) (1 diff)
• tests/enum_tests/typedIntEnum.cfa (modified) (1 diff)
• tests/enum_tests/voidEnum.cfa (modified) (1 diff)

libcfa/prelude/builtins.c

@@ -160 +160 @@
 static inline quasi_void ?=?(quasi_void &, quasi_void & _src) { return _src; }
 
-forall( E ) trait Bounded {
-        E lowerBound(void);
-        E upperBound(void);
-};
-
-forall( E | Bounded( E ) ) trait Serial {
-        int fromInstance( E e );
-        E fromInt_unsafe( int i );
-        E succ_unsafe( E e );
-        E pred_unsafe( E e );
-};
-
-static inline forall( E | Serial( E ) ) {
-        E fromInt( int i );
-        E succ( E e );
-        E pred( E e );
-        int Countof( E );
-}
-
-forall( E ) trait CfaEnum {
-        const char * label( E e );
-        int posn( E e );
-};
-
-forall( E, V | CfaEnum( E ) ) trait TypedEnum {
-        V value( E e );
-};
-
-static inline {
-forall( E | Serial( E ) ) {
-        E fromInt( int i ) {
-                E upper = upperBound();
-                E lower = lowerBound();
-                // It is okay to overflow as overflow will be theoretically caught by the other bound
-                if ( i < fromInstance( lower ) || i > fromInstance( upper ) )
-                        abort( "call to fromInt has index %d outside of enumeration range %d-%d.",
-                                   i, fromInstance( lower ), fromInstance( upper ) );
-                return fromInt_unsafe( i );
-        }
-
-        E succ( E e ) {
-                E upper = upperBound();
-                if ( fromInstance( e ) >= fromInstance( upper ) )
-                        abort( "call to succ() exceeds enumeration upper bound of %d.", fromInstance( upper ) );
-                return succ_unsafe(e);
-        }
-
-        E pred( E e ) {
-                E lower = lowerBound();
-                if ( fromInstance( e ) <= fromInstance(lower ) )
-                        abort( "call to pred() exceeds enumeration lower bound of %d.", fromInstance( lower ) );
-                return pred_unsafe( e );
-        }
-
-        int Countof( E ) {
-                E upper = upperBound();
-                E lower = lowerBound();
-                return fromInstance( upper ) + fromInstance( lower ) + 1;
-        }
-}
-}
-
-static inline
-forall( E | CfaEnum(E) | Serial(E) ) {
-        int ?==?( E l, E r ) { return posn( l ) == posn( r ); } // relational operators
-        int ?!=?( E l, E r ) { return posn( l ) != posn( r ); }
-        int ?<?( E l, E r ) { return posn( l ) < posn( r ); }
-        int ?<=?( E l, E r ) { return posn( l ) <= posn( r ); }
-        int ?>?( E l, E r ) { return posn( l ) > posn( r ); }
-        int ?>=?( E l, E r ) { return posn( l ) >= posn( r ); }
-
-        E ++?( E & l ) {                                                                        // increment operators
-                int pos = posn(l);
-                l = fromInt_unsafe(pos+1);
-                return l;
-        }
-
-        E --?( E & l ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos-1);
-                return l;
-        }
-
-        E ?+=? ( E & l, one_t ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos+1);
-                return l;
-        }
-
-        E ?-=? ( E & l, one_t ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos-1);
-                return l;
-        }
-
-        E ?+=? ( E & l, int i ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos+i);
-                return l;
-        }
-
-        E ?-=? ( E & l, int i ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos-i);
-                return l;
-        }
-
-        E ?++( E & l ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos+1);
-                return fromInt_unsafe(pos);
-        }
-
-        E ?--( E & l ) {
-                int pos = posn(l);
-                l = fromInt_unsafe(pos-1);
-                return fromInt_unsafe(pos);
-        }
-}
-
 // Local Variables: //
 // mode: c //

libcfa/src/Makefile.am

@@ -85 +85 @@
         parseconfig.hfa \
         rational.hfa \
+        enum.hfa \
         stdlib.hfa \
         strstream.hfa \

libcfa/src/iostream.cfa

@@ -1202 +1202 @@
 
 
-forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial( E ) )
-istype & ?|?( istype & is, E & e ) {
-//      fprintf( stderr, "here0\n" );
-        if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
-
-        // Match longest input enumerator string to enumerator labels, where enumerator names are unique.
-
-        int N = countof( E ), lnths[N], fred = 0;
-//      printf( "N %d\n", N );
-        int r = 0;
-        // for ( s; E : r; 0~@ ) {
-        for ( s; E ) {                                                                          // scan string rows gathering lengths
-                lnths[r] = strlen( label( s ) );
-                if ( lnths[r] > fred ) fred = lnths[r];
-//              fprintf( stderr, "%s %d %d\n", label( s ), lnths[r], fred );
-                r += 1;
-        } // for
-
-        int mcol = -1;                                                                          // last match column
-        char ch, curr = '\0', prev = '\0';
-
-        fmt( is, " " );                                                                         // skip optional whitespace
-        if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
-
-        for ( c; fred ) {                                                                       // scan columns of the label matix (some columns missing)
-                int args = fmt( is, "%c", &ch );                                // read character
-//              fprintf( stderr, "fmt args: %d eof: %d\n", args, eof(is) );
-          if ( eof( is ) ) {
-//                      fprintf( stderr, "Eof1\n" );
-                        if ( c == 0 ) return is;                                        // no characters read ?
-                        clear( is );                                                            // => read something => reset EOF => detect again on next read
-//                      fprintf( stderr, "Eof2\n" );
-                        break;
-                } // if
-          if ( args != 1 ) throwResume ExceptionInst( missing_data ); // may be unnecessary since reading single character
-
-//              printf( "read '%c'\n", ch );
-                for ( r; N ) {                                                                  // scan enumeration strings for matching character in current column
-//                      printf( "%d %d %d\n", c, r, lnths[r] );
-                        if ( c < lnths[r] ) {                                           // string long enough for this column check ?
-                                char match = label( fromInt( r ) )[c];  // optimization
-//                              printf( "%c '%c'\n", match, ch );
-                                // Stop on first match, could be other matches.
-                                if ( (match == ch) && (c == 0 || curr == label( fromInt( r ) )[c - 1]) ) {
-//                                      printf( "match %d %d %d '%c' '%c' '%c' '%c' 'c'\n", c, r, lnths[r], match, ch, prev, label( fromInt( r ) )[c - 1] );
-                                        mcol = c;                                                       // matching column
-                                        prev = curr;                                            // last matching character
-                                        curr = ch;                                                      // current matching character
-                                        break;
-                                } // if
-                        } // if
-                } else {
-//                      fprintf( stderr, "finished mcol: %d ch: '%c' curr: '%c' prev: '%c'\n", mcol, ch, curr, prev );
-                        ungetc( ch, is );                                                       // push back last unmatching character
-                        if ( mcol == -1 ) throwResume ExceptionInst( missing_data ); // no matching character in first column
-                        break;
-                } // for
-//              printf( "\n" );
-//      } else {
-//              fprintf( stderr, "finished2 %d\n", mcol );
-        } // for
-
-        for ( c; N ) {                                                                          // scan enumeration strings of length "mcol" for match
-                if ( mcol == lnths[c] - 1 ) {
-                        char match = label( fromInt( c ) )[mcol];       // optimization
-//                      printf( "finished1 mcol: %d c: %d lnth: %d match: '%c' curr: '%c' prev: '%c'\n", mcol, c, lnths[c], match, curr, prev );
-                        if ( (match == curr) && (mcol == 0 || prev == label( fromInt( c ) )[mcol - 1]) ) {
-                                e = fromInt( c );
-                                break;
-                        } // if
-                } // if
-        } else {
-//              fprintf( stderr, "finished3 %d\n", mcol );
-                throwResume ExceptionInst( missing_data );              // no match in this column
-        } // for
-        return is;
-}
-
-forall( ostype & | ostream( ostype ), E | CfaEnum( E ) ) {
-        ostype & ?|?( ostype & os, E e ) {
-                return os | label( e );
-        }
-        OSTYPE_VOID_IMPL( os, E )
-}
-
 // Local Variables: //
 // tab-width: 4 //

libcfa/src/iostream.hfa

@@ -507 +507 @@
 } // distribution
 
-forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial(E) )
-istype & ?|?( istype &, E & );
-
-forall( ostype & | ostream( ostype ), E | CfaEnum( E ) ) {
-        ostype & ?|?( ostype &, E );
-        OSTYPE_VOID( E );
-}
-
 // Local Variables: //
 // tab-width: 4 //

libcfa/src/rational.cfa

@@ -21 +21 @@
 
 // Arithmetic, Relational
-forall( T | Simple(T) ) {
+
+forall( T | arithmetic( T ) ) {
         // helper routines
+
         // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce
         // rationals.  alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
@@ -42 +44 @@
                 return gcd( abs( n ), d );                                              // simplify
         } // simplify
-}
-
-forall( T | arithmetic( T ) ) {
+
         // constructors
 
@@ -197 +197 @@
 
 forall( T ) {
-        forall( istype & | istream( istype ) | { istype & ?|?( istype &, T & ); } | Simple(T) )
+        forall( istype & | istream( istype ) | { istype & ?|?( istype &, T & ); } | arithmetic( T ) )
         istype & ?|?( istype & is, rational(T) & r ) {
                 is | r.numerator | r.denominator;

libcfa/src/rational.hfa

@@ -78 +78 @@
 
 // I/O
-forall(T | multiplicative(T) | equality(T))
-trait Simple {
-        int ?<?( T, T );
-};
 
 forall( T ) {
-        forall( istype & | istream( istype ) | { istype & ?|?( istype &, T & ); } | Simple(T) )
+        forall( istype & | istream( istype ) | { istype & ?|?( istype &, T & ); } | arithmetic( T ) )
         istype & ?|?( istype &, rational(T) & );
 

src/AST/Decl.hpp

@@ -74 +74 @@
         bool isTypeFixed = false;
         bool isHidden = false;
-        bool isMember = false;
 
         DeclWithType( const CodeLocation& loc, const std::string& name, Storage::Classes storage,

src/AST/Expr.cpp

@@ -123 +123 @@
 bool VariableExpr::get_lvalue() const {
         // It isn't always an lvalue, but it is never an rvalue.
-        if(dynamic_cast<const ast::EnumInstType *>(var->get_type())) return !var->isMember;
         return true;
 }

src/Parser/TypeData.cpp

@@ -1481 +1481 @@
                 ast::ObjectDecl * object = strict_dynamic_cast<ast::ObjectDecl *>( member );
                 object->isHidden = ast::EnumDecl::EnumHiding::Hide == ret->hide;
-                object->isMember = true;
                 if ( ret->isOpaque() && cur->has_enumeratorValue() ) {
                         SemanticError( td->location, "Opague cannot have an explicit initializer value." );

tests/.expect/KRfunctions.arm64.txt

@@ -104 +104 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
+        signed int *(*_tmp_cp_ret0)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret0=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret0)));
     }
 

tests/.expect/KRfunctions.x64.txt

@@ -104 +104 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
+        signed int *(*_tmp_cp_ret0)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret0=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret0)));
     }
 

tests/.expect/declarationSpecifier.arm64.txt

@@ -1059 +1059 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret0;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/declarationSpecifier.x64.txt

@@ -1059 +1059 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret0;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/declarationSpecifier.x86.txt

@@ -1059 +1059 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret0;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/extension.x64.txt

@@ -457 +457 @@
 
     {
-        signed int _tmp_cp_ret8;
-        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
+        signed int _tmp_cp_ret0;
+        ((void)(((void)(_tmp_cp_ret0=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret0));
     }
 

tests/.expect/extension.x86.txt

@@ -457 +457 @@
 
     {
-        signed int _tmp_cp_ret8;
-        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
+        signed int _tmp_cp_ret0;
+        ((void)(((void)(_tmp_cp_ret0=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret0));
     }
 

tests/.expect/gccExtensions.arm64.txt

@@ -339 +339 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret0;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/gccExtensions.x64.txt

@@ -339 +339 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret0;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/ctrl-flow/loopctrl.cfa

@@ -15 +15 @@
 
 #include <fstream.hfa>
+#include <enum.hfa>
 
 void fred() {

tests/enum_tests/.expect/position.txt

@@ -1 @@
-Enumeration Constant<Blue>:: value: blue, position: 2, label: Blue, default output: Blue
-Runtime Value<fishy>:: value: green, position: 1, label: Green, default output: Green
-Runtime Value<C2>:: value: green, position: 1, label: Green, default output: Green
+Compile Time: blue value: blue, position: 2, label: Blue, default return value: blue
+Runtime: fishy value: green, position: 1, label: Green, default return value: green
+Runtime: C2 value: green, position: 1, label: Green, default return value: green
 ao is red
 ko is green

tests/enum_tests/anonymous.cfa

@@ -3 +3 @@
 
 int main() {
-    sout | value(nthreads);
+    sout | nthreads;
 }
 

tests/enum_tests/enumInlineValue.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
+#include <enum.hfa>
 
 enum(int) A !{

tests/enum_tests/input.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
+#include <enum.hfa>
 
 int main() {

tests/enum_tests/planet.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 #include <stdlib.hfa>
+#include <enum.hfa>
 
 struct MR { double mass, radius; };

tests/enum_tests/position.cfa

@@ -17 +17 @@
     Colour c2 = fishy;
 
-    sout | "Enumeration Constant<Blue>:: value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default output: " | Colour.Blue;
-    sout | "Runtime Value<fishy>:: value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default output: " | fishy;
-    sout | "Runtime Value<C2>:: value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default output: " | c2;
+    sout | "Compile Time: blue value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default return value: " | Colour.Blue;
+    sout | "Runtime: fishy value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default return value: " | fishy;
+    sout | "Runtime: C2 value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default return value: " | c2;
     Colour.Red;
     char * ao = Colour.Red;

tests/enum_tests/typedIntEnum.cfa

@@ -12 +12 @@
 
 int main() {
-    sout | "0=" | value(zero);
-    sout | "1=" | value(one);
-    sout | "1000=" | value(thousand);
-    sout | "1001=" | value(thousand_one);
-    sout | "2000=" | value(two_thousand);
-    sout | "2001=" | value(two_thousand_one);
-    sout | "2002=" | value(two_thousand_two);
+    sout | "0=" | zero;
+    sout | "1=" | one;
+    sout | "1000=" | thousand;
+    sout | "1001=" | thousand_one;
+    sout | "2000=" | two_thousand;
+    sout | "2001=" | two_thousand_one;
+    sout | "2002=" | two_thousand_two;
     return 0;
 }

tests/enum_tests/voidEnum.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
+#include <enum.hfa>
 
 enum() E { A, B, C };