clean: reorganize lpc related headers (#78)

taedlar · web-flow · commit a3ccc79c8850 · 2025-10-17T16:30:32.000+08:00
diff --git a/lib/efuns/CMakeLists.txt b/lib/efuns/CMakeLists.txt
@@ -36,7 +36,6 @@ set(efuns_SOURCES
     file.c
     file_utils.c
     math.c
-    operator.c
     parse.c
     reclaim_object.c
     replace_program.c
diff --git a/lib/efuns/call_out.c b/lib/efuns/call_out.c
@@ -8,7 +8,7 @@
 #include "lpc/object.h"
 #include "lpc/include/origin.h"
 
-#include "operator.h"
+#include "lpc/operator.h"
 #include "call_out.h"
 
 #define CHUNK_SIZE	20
diff --git a/lib/efuns/dump_prog.c b/lib/efuns/dump_prog.c
@@ -5,7 +5,7 @@
 #include "src/std.h"
 #include "file_utils.h"
 #include "src/interpret.h"
-#include "lpc/disassemble.h"
+#include "lpc/program/disassemble.h"
 #include "lpc/object.h"
 #include "lpc/program.h"
 
diff --git a/lib/efuns/string.c b/lib/efuns/string.c
@@ -10,7 +10,7 @@
 #include "lpc/array.h"
 #include "lpc/buffer.h"
 
-#include "operator.h"
+#include "lpc/operator.h"
 #include "sprintf.h"
 
 
diff --git a/lib/efuns/unsorted.c b/lib/efuns/unsorted.c
@@ -28,7 +28,7 @@
 #include "lpc/include/origin.h"
 
 #include "sprintf.h"
-#include "operator.h"
+#include "lpc/operator.h"
 #include "parse.h"
 #include "dumpstat.h"
 
diff --git a/lib/lpc/CMakeLists.txt b/lib/lpc/CMakeLists.txt
@@ -4,11 +4,15 @@ set(lpc_SOURCES
     array.c
     buffer.c
     class.c
-    disassemble.c
     mapping.c
     object.c
+    operator.c
     otable.c
     program.c
+    program/binaries.c
+    program/disassemble.c
+    program/icode.c
+    program/parse_trees.c
 )
 add_library(lpc STATIC ${lpc_SOURCES})
 target_sources(lpc INTERFACE
diff --git a/lib/lpc/operator.c b/lib/lpc/operator.c
@@ -9,19 +9,19 @@
 
 #define SUPPRESS_COMPILER_INLINES
 #include "src/std.h"
-#include "lpc/array.h"
-#include "lpc/buffer.h"
-#include "lpc/mapping.h"
-#include "lpc/object.h"
-#include "lpc/program.h"
-#include "lpc/functional.h"
+#include "array.h"
+#include "buffer.h"
+#include "mapping.h"
+#include "object.h"
+#include "program.h"
+#include "functional.h"
 #include "lpc/include/function.h"
 #include "lpc/include/origin.h"
 #include "src/interpret.h"
 #include "src/simul_efun.h"
 
 #include "operator.h"
-#include "parse.h"
+#include "efuns/parse.h"
 
 void
 dealloc_funp (funptr_t * fp)
diff --git a/lib/lpc/operator.h b/lib/lpc/operator.h
@@ -1,4 +1,5 @@
 #pragma once
+
 void f_ge(void);
 void f_le(void);
 void f_lt(void);
@@ -34,7 +35,6 @@ void f_sscanf(void);
 funptr_t *make_funp(svalue_t *, svalue_t *);
 void push_funp(funptr_t *);
 void free_funp(funptr_t *);
-int merge_arg_lists(int, array_t *, int);
 void call_simul_efun(unsigned short, int);
 
 funptr_t *make_efun_funp(int, svalue_t *);
diff --git a/lib/lpc/program/binaries.c b/lib/lpc/program/binaries.c
@@ -16,10 +16,10 @@
 #include <sys/types.h>
 
 #define SUPPRESS_COMPILER_INLINES
-#include "std.h"
+#include "src/std.h"
 #include "lpc/object.h"
 #include "lpc/include/runtime_config.h"
-#include "rc.h"
+#include "src/rc.h"
 #include "binaries.h"
 #include "qsort.h"
 #include "hash.h"
diff --git a/lib/lpc/program/binaries.h b/lib/lpc/program/binaries.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "compiler.h"
+#include <stdio.h>
+#include "src/compiler.h"
 
 FILE *crdir_fopen(char *);
 void init_binaries();
diff --git a/lib/lpc/program/disassemble.c b/lib/lpc/program/disassemble.c
@@ -3,7 +3,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "disassemble.h"
-#include "program.h"
+#include "lpc/program.h"
 #include "lpc/include/function.h"
 #include "src/std.h"
 #include "src/interpret.h"
diff --git a/lib/lpc/program/disassemble.h b/lib/lpc/program/disassemble.h
@@ -2,7 +2,7 @@
 
 #include <stdio.h>
 
-#include "types.h"
+#include "lpc/types.h"
 
 extern void disassemble (FILE *, char *, int, int, program_t *);
 extern void dump_line_numbers (FILE *, program_t *);
diff --git a/lib/lpc/program/icode.c b/lib/lpc/program/icode.c
@@ -5,13 +5,11 @@
 /* 
  * code generator for runtime LPC code
  */
-#include "std.h"
+#include "src/std.h"
 #include "lpc/include/function.h"
-#include "interpret.h"
 #include "icode.h"
-#include "trees.h"
-#include "compiler.h"
-#include "generate.h"
+#include "src/generate.h"
+#include "src/compiler.h"
 
 static void ins_real (double);
 static void ins_short (short);
diff --git a/lib/lpc/program/icode.h b/lib/lpc/program/icode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "trees.h"
+#include "lpc/program/parse_trees.h"
 
 void i_generate___INIT(void);
 void i_generate_node(parse_node_t *);
diff --git a/lib/lpc/program/parse_trees.c b/lib/lpc/program/parse_trees.c
@@ -12,9 +12,10 @@
  */
 
 #define SUPPRESS_COMPILER_INLINES
-#include "std.h"
-#include "trees.h"
-#include "compiler.h"
+#include "src/std.h"
+#include "src/compiler.h"
+
+#include "parse_trees.h"
 
 /* our globals */
 static parse_node_block_t *parse_block_list = 0;
diff --git a/lib/lpc/program/parse_trees.h b/lib/lpc/program/parse_trees.h
diff --git a/lib/socket/socket_efuns.c b/lib/socket/socket_efuns.c
@@ -29,7 +29,7 @@
 #include "socket_err.h"
 #include "socket_ctrl.h"
 #include "lpc/include/socket_err.h"
-#include "efuns/operator.h"
+#include "lpc/operator.h"
 
 #define	socket_errno		errno
 #define socket_perror(x,y)	debug_perror(x,y)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,11 +6,9 @@ BISON_TARGET(grammar grammar.y ${CMAKE_CURRENT_BINARY_DIR}/grammar.c
 
 set(neolith_SOURCES
     backend.c
-    binaries.c
     comm.c
     compiler.c
     generate.c
-    icode.c
     interpret.c
     lex.c
     main.c
@@ -21,7 +19,6 @@ set(neolith_SOURCES
     simul_efun.c
     simulate.c
     stralloc.c
-    trees.c
     uids.c
 )
 
diff --git a/src/comm.c b/src/comm.c
@@ -11,7 +11,7 @@
 #include "interpret.h"
 #include "socket/socket_efuns.h"
 #include "socket/socket_ctrl.h"
-#include "efuns/operator.h"
+#include "lpc/operator.h"
 #include "efuns/ed.h"
 
 #include "lpc/include/runtime_config.h"
diff --git a/src/compiler.c b/src/compiler.c
@@ -5,15 +5,13 @@
 #include "std.h"
 #include "rc.h"
 #include "compiler.h"
-#include "trees.h"
 #include "lex.h"
 #include "generate.h"
 #include "scratchpad.h"
 #include "qsort.h"
-#include "binaries.h"
+#include "lpc/program/binaries.h"
 
 #include "interpret.h"
-#include "icode.h"
 #include "lpc/object.h"
 #include "lpc/functional.h"
 
diff --git a/src/compiler.h b/src/compiler.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "trees.h"
 #include "lex.h"
+#include "lpc/program/parse_trees.h"
 #include "lpc/program.h"
 
 #define YYMAXDEPTH    600
diff --git a/src/generate.h b/src/generate.h
@@ -1,7 +1,6 @@
 #pragma once
-#include "trees.h"
 #include "lpc/program.h"
-#include "icode.h"
+#include "lpc/program/icode.h"
 
 #define generate_function_call i_generate_function_call
 #define generate_inherited_init_call i_generate_inherited_init_call
diff --git a/src/grammar.y b/src/grammar.y
diff --git a/src/interpret.c b/src/interpret.c
diff --git a/src/interpret.h b/src/interpret.h
diff --git a/src/main.c b/src/main.c
diff --git a/src/simulate.c b/src/simulate.c
diff --git a/src/uids.c b/src/uids.c
