Changeset 85d44c6 for src/SynTree

Timestamp:

Feb 14, 2019, 10:23:51 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

fba51ab

Parents:

6d01d89 (diff), e15853c (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:

fix conflict

Location:

src/SynTree

Files:

• BasicType.cc (modified) (3 diffs)
• Constant.cc (modified) (1 diff)
• Type.cc (modified) (3 diffs)
• Type.h (modified) (3 diffs)

src/SynTree/BasicType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 14:14:03 2017
-// Update Count     : 11
+// Last Modified On : Thu Jan 31 21:37:36 2019
+// Update Count     : 12
 //
 
@@ -30 +30 @@
 
 bool BasicType::isInteger() const {
+        return kind <= UnsignedInt128;
+#if 0
         switch ( kind ) {
           case Bool:
@@ -63 +65 @@
         assert( false );
         return false;
+#endif
 }
 

src/SynTree/Constant.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Spt 28 14:49:00 2018
-// Update Count     : 30
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb 13 18:11:22 2019
+// Update Count     : 32
 //
 

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 22 10:17:19 2018
-// Update Count     : 39
+// Last Modified On : Thu Jan 31 21:54:16 2019
+// Update Count     : 43
 //
 #include "Type.h"
@@ -25 +25 @@
 
 const char *BasicType::typeNames[] = {
+#if 0
         "_Bool",
         "char",
@@ -49 +50 @@
         "unsigned __int128",
         "__float80",
-        "__float128"
+        "__float128",
+        "_Float16",
+        "_Float32",
+        "_Float32x",
+        "_Float64",
+        "_Float64x",
+        "_Float128",
+        "_Float128x",
+        "_Float16 _Complex",
+        "_Float32 _Complex",
+        "_Float32x _Complex",
+        "_Float64 _Complex",
+        "_Float64x _Complex",
+        "_Float128 _Complex",
+        "_Float128x _Complex",
+#endif
+        "_Bool",
+        "char",
+        "signed char",
+        "unsigned char",
+        "signed short int",
+        "unsigned short int",
+        "signed int",
+        "unsigned int",
+        "signed long int",
+        "unsigned long int",
+        "signed long long int",
+        "unsigned long long int",
+        "__int128",
+        "unsigned __int128",
+        "_Float16",
+        "_Float16 _Complex",
+        "_Float32",
+        "_Float32 _Complex",
+        "float",
+        "float _Complex",
+        //"float _Imaginary",
+        "_Float32x",
+        "_Float32x _Complex",
+        "_Float64",
+        "_Float64 _Complex",
+        "double",
+        "double _Complex",
+        //"double _Imaginary",
+        "_Float64x",
+        "_Float64x _Complex",
+        "__float80",
+        "_Float128",
+        "_Float128 _Complex",
+        "__float128",
+        "long double",
+        "long double _Complex",
+        //"long double _Imaginary",
+        "_Float128x",
+        "_Float128x _Complex",
 };
 static_assert(

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 14:14:01 2017
-// Update Count     : 154
+// Last Modified On : Wed Feb 13 18:10:45 2019
+// Update Count     : 167
 //
 
@@ -207 +207 @@
 class BasicType : public Type {
   public:
+#if 0
         enum Kind {
                 Bool,
@@ -233 +234 @@
                 Float80,
                 Float128,
+                _Float16,
+                _Float32,
+                _Float32x,
+                _Float64,
+                _Float64x,
+                _Float128,
+                _Float128x,
+                _Float16Complex,
+                _Float32Complex,
+                _Float32xComplex,
+                _Float64Complex,
+                _Float64xComplex,
+                _Float128Complex,
+                _Float128xComplex,
+                NUMBER_OF_BASIC_TYPES
+        } kind;
+#endif
+        enum Kind {
+                Bool,
+                Char,
+                SignedChar,
+                UnsignedChar,
+                ShortSignedInt,
+                ShortUnsignedInt,
+                SignedInt,
+                UnsignedInt,
+                LongSignedInt,
+                LongUnsignedInt,
+                LongLongSignedInt,
+                LongLongUnsignedInt,
+                SignedInt128,
+                UnsignedInt128,
+                uFloat16,
+                uFloat16Complex,
+                uFloat32,
+                uFloat32Complex,
+                Float,
+                FloatComplex,
+                // FloatImaginary,
+                uFloat32x,
+                uFloat32xComplex,
+                uFloat64,
+                uFloat64Complex,
+                Double,
+                DoubleComplex,
+                // DoubleImaginary,
+                uFloat64x,
+                uFloat64xComplex,
+                uuFloat80,
+                uFloat128,
+                uFloat128Complex,
+                uuFloat128,
+                LongDouble,
+                LongDoubleComplex,
+                // LongDoubleImaginary,
+                uFloat128x,
+                uFloat128xComplex,
                 NUMBER_OF_BASIC_TYPES
         } kind;