Changeset b7d6a36 for src/SynTree/LinkageSpec.h

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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' into relaxed_ready

File:

• src/SynTree/LinkageSpec.h (moved) (moved from src/Parser/LinkageSpec.h ) (3 diffs)

src/SynTree/LinkageSpec.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 10 16:02:34 2019
-// Update Count     : 18
+// Last Modified On : Mon Dec 16 15:03:43 2019
+// Update Count     : 20
 //
 
@@ -21 +21 @@
 
 namespace LinkageSpec {
-        // All linkage specs are some combination of these flags:
-        enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
+        // Bitflags for linkage specifiers
+        enum {
+                Mangle = 1 << 0,
+                Generate = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin = 1 << 3,
+                GccBuiltin = 1 << 4,
+        };
 
+        // Bitflag type for storage classes
         union Spec {
                 unsigned int val;
@@ -42 +49 @@
 
 
-        Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd );
-        /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
-         * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
-         */
+        Spec update( CodeLocation location, Spec spec, const std::string * cmd );
+        // If cmd = "C" returns a Spec that is old_spec with is_mangled = false
+        // If cmd = "Cforall" returns old_spec Spec with is_mangled = true
 
-        std::string linkageName( Spec );
+        std::string name( Spec );
 
         // To Update: LinkageSpec::isXyz( cur_spec ) -> cur_spec.is_xyz