Move compiler macro definitions into include/prism/attribute

kddnewton · kddnewton · commit a18e3ca17899 · 2026-03-18T15:38:43.000-04:00
diff --git a/include/prism/arena.h b/include/prism/arena.h
@@ -6,9 +6,9 @@
 #ifndef PRISM_ARENA_H
 #define PRISM_ARENA_H
 
-#include "prism/exported.h"
-#include "prism/flex_array.h"
-#include "prism/force_inline.h"
+#include "prism/attribute/exported.h"
+#include "prism/attribute/flex_array.h"
+#include "prism/attribute/force_inline.h"
 
 #include <stddef.h>
 
diff --git a/include/prism/attribute/align.h b/include/prism/attribute/align.h
@@ -1,5 +1,5 @@
 /**
- * @file align.h
+ * @file attribute/align.h
  *
  * Alignment macros used throughout the prism library.
  */
diff --git a/include/prism/attribute/exported.h b/include/prism/attribute/exported.h
@@ -1,5 +1,5 @@
 /**
- * @file exported.h
+ * @file attribute/exported.h
  *
  * Macro definitions for make functions publically visible.
  */
diff --git a/include/prism/attribute/flex_array.h b/include/prism/attribute/flex_array.h
@@ -1,5 +1,5 @@
 /**
- * @file flex_array.h
+ * @file attribute/flex_array.h
  *
  * Macro definitions for working with flexible array members.
  */
diff --git a/include/prism/attribute/force_inline.h b/include/prism/attribute/force_inline.h
@@ -1,5 +1,5 @@
 /**
- * @file force_inline.h
+ * @file attribute/force_inline.h
  *
  * Macro definitions for forcing a function to be inlined at every call site.
  */
diff --git a/include/prism/attribute/format.h b/include/prism/attribute/format.h
@@ -1,5 +1,5 @@
 /**
- * @file format.h
+ * @file attribute/format.h
  *
  * Macro definition for specifying that a function accepts variadic parameters
  * that look like printf format strings.
diff --git a/include/prism/buffer.h b/include/prism/buffer.h
@@ -6,7 +6,7 @@
 #ifndef PRISM_BUFFER_H
 #define PRISM_BUFFER_H
 
-#include "prism/exported.h"
+#include "prism/attribute/exported.h"
 
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/include/prism/defines.h b/include/prism/defines.h
@@ -9,12 +9,12 @@
 #ifndef PRISM_DEFINES_H
 #define PRISM_DEFINES_H
 
-#include "prism/align.h"
+#include "prism/attribute/align.h"
+#include "prism/attribute/exported.h"
+#include "prism/attribute/flex_array.h"
+#include "prism/attribute/force_inline.h"
+#include "prism/attribute/format.h"
 #include "prism/allocator.h"
-#include "prism/exported.h"
-#include "prism/flex_array.h"
-#include "prism/force_inline.h"
-#include "prism/format.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/include/prism/internal/arena.h b/include/prism/internal/arena.h
@@ -6,8 +6,8 @@
 #ifndef PRISM_INTERNAL_ARENA_H
 #define PRISM_INTERNAL_ARENA_H
 
+#include "prism/attribute/exported.h"
 #include "prism/arena.h"
-#include "prism/exported.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/include/prism/internal/buffer.h b/include/prism/internal/buffer.h
@@ -7,7 +7,7 @@
 #define PRISM_INTERNAL_BUFFER_H
 
 #include "prism/buffer.h"
-#include "prism/format.h"
+#include "prism/attribute/format.h"
 
 #include <stdint.h>
 
diff --git a/include/prism/internal/char.h b/include/prism/internal/char.h
@@ -6,8 +6,8 @@
 #ifndef PRISM_INTERNAL_CHAR_H
 #define PRISM_INTERNAL_CHAR_H
 
+#include "prism/attribute/force_inline.h"
 #include "prism/arena.h"
-#include "prism/force_inline.h"
 #include "prism/line_offset_list.h"
 
 #include <stdbool.h>
diff --git a/include/prism/internal/line_offset_list.h b/include/prism/internal/line_offset_list.h
@@ -15,8 +15,8 @@
 #define PRISM_INTERNAL_LINE_OFFSET_LIST_H
 
 #include "prism/line_offset_list.h"
+#include "prism/attribute/force_inline.h"
 #include "prism/arena.h"
-#include "prism/force_inline.h"
 
 /**
  * Initialize a new line offset list with the given capacity.
diff --git a/include/prism/line_offset_list.h b/include/prism/line_offset_list.h
@@ -14,7 +14,7 @@
 #ifndef PRISM_LINE_OFFSET_LIST_H
 #define PRISM_LINE_OFFSET_LIST_H
 
-#include "prism/exported.h"
+#include "prism/attribute/exported.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/prism.gemspec b/prism.gemspec
@@ -46,7 +46,11 @@ Gem::Specification.new do |spec|
     "ext/prism/extension.c",
     "ext/prism/extension.h",
     "include/prism.h",
-    "include/prism/align.h",
+    "include/prism/attribute/align.h",
+    "include/prism/attribute/exported.h",
+    "include/prism/attribute/flex_array.h",
+    "include/prism/attribute/force_inline.h",
+    "include/prism/attribute/format.h",
     "include/prism/allocator.h",
     "include/prism/arena.h",
     "include/prism/ast.h",
@@ -55,10 +59,6 @@ Gem::Specification.new do |spec|
     "include/prism/defines.h",
     "include/prism/diagnostic.h",
     "include/prism/encoding.h",
-    "include/prism/exported.h",
-    "include/prism/flex_array.h",
-    "include/prism/force_inline.h",
-    "include/prism/format.h",
     "include/prism/integer.h",
     "include/prism/line_offset_list.h",
     "include/prism/node.h",
diff --git a/src/line_offset_list.c b/src/line_offset_list.c
@@ -1,6 +1,6 @@
+#include "prism/attribute/align.h"
 #include "prism/internal/line_offset_list.h"
 #include "prism/internal/arena.h"
-#include "prism/align.h"
 
 #include <assert.h>
 #include <string.h>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * @file align.h`
	`2`	`+ * @file attribute/align.h`
`3`	`3`	`*`
`4`	`4`	`* Alignment macros used throughout the prism library.`
`5`	`5`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * @file exported.h`
	`2`	`+ * @file attribute/exported.h`
`3`	`3`	`*`
`4`	`4`	`* Macro definitions for make functions publically visible.`
`5`	`5`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * @file flex_array.h`
	`2`	`+ * @file attribute/flex_array.h`
`3`	`3`	`*`
`4`	`4`	`* Macro definitions for working with flexible array members.`
`5`	`5`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * @file force_inline.h`
	`2`	`+ * @file attribute/force_inline.h`
`3`	`3`	`*`
`4`	`4`	`* Macro definitions for forcing a function to be inlined at every call site.`
`5`	`5`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * @file format.h`
	`2`	`+ * @file attribute/format.h`
`3`	`3`	`*`
`4`	`4`	`* Macro definition for specifying that a function accepts variadic parameters`
`5`	`5`	`* that look like printf format strings.`