script_syntax.c ローカルな定数を移動

git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@277 24ea1065-a21e-4ca1-99c9-f5125deb0858

diff --git a/client/trunk/script_syntax.h b/client/trunk/script_syntax.h
index f559236..7e708ee 100644 (file)
--- a/client/trunk/script_syntax.h
+++ b/client/trunk/script_syntax.h
@@ -2,29 +2,6 @@
 #define _SYNTAX_H_
 #include "config.h"
 #include "header.h"
-struct script_syntax{
-       const char *name;
-       int script_opcode;
-       int permittion;
-       int argc, compare;
-       const int *argv_type;
-};
-enum{
-       SYNTAX_ARGVTYPE_NULL,
-       SYNTAX_ARGVTYPE_VALUE,
-       SYNTAX_ARGVTYPE_HV,
-       SYNTAX_ARGVTYPE_EXPRESSION,
-       SYNTAX_ARGVTYPE_VARIABLE,
-       SYNTAX_ARGVTYPE_CONSTANT,
-       SYNTAX_ARGVTYPE_TRANSTYPE
-};
-enum{
-       SYNTAX_COMPARE_EQ,
-       SYNTAX_COMPARE_GT
-};
-enum{
-       SYNTAX_ARGV_TYPE_NUM = 4
-};
 enum{
        SCRIPT_OPCODE_MAPPER,
        SCRIPT_OPCODE_MIRROR,
@@ -51,13 +28,6 @@ enum{
        SCRIPT_OPCODE_COMMENT,
        SCRIPT_OPCODE_NUM
 };
-enum{
-       PERMITTION_ROM_DUMP = 1 << MODE_ROM_DUMP,
-       PERMITTION_RAM_READ = 1 << MODE_RAM_READ,
-       PERMITTION_RAM_WRITE = 1 << MODE_RAM_WRITE,
-       PERMITTION_ROM_PROGRAM = 1 << MODE_ROM_PROGRAM,
-       PERMITTION_ALL = 0xffff
-};
 extern const char OPSTR_CPU_ROMSIZE[];
 extern const char OPSTR_CPU_RAMSIZE[];
 extern const char OPSTR_CPU_FLASHSIZE[];

diff --git a/client/trunk/syntax_data.h b/client/trunk/syntax_data.h
index 22d1b2a..76b708e 100644 (file)
--- a/client/trunk/syntax_data.h
+++ b/client/trunk/syntax_data.h
@@ -1,4 +1,34 @@
 //included from syntax.c only
+struct script_syntax{
+       const char *name;
+       int script_opcode;
+       int permittion;
+       int argc, compare;
+       const int *argv_type;
+};
+enum{
+       SYNTAX_ARGVTYPE_NULL,
+       SYNTAX_ARGVTYPE_VALUE,
+       SYNTAX_ARGVTYPE_HV,
+       SYNTAX_ARGVTYPE_EXPRESSION,
+       SYNTAX_ARGVTYPE_VARIABLE,
+       SYNTAX_ARGVTYPE_CONSTANT,
+       SYNTAX_ARGVTYPE_TRANSTYPE
+};
+enum{
+       SYNTAX_COMPARE_EQ,
+       SYNTAX_COMPARE_GT
+};
+enum{
+       SYNTAX_ARGV_TYPE_NUM = 4
+};
+enum{
+       PERMITTION_ROM_DUMP = 1 << MODE_ROM_DUMP,
+       PERMITTION_RAM_READ = 1 << MODE_RAM_READ,
+       PERMITTION_RAM_WRITE = 1 << MODE_RAM_WRITE,
+       PERMITTION_ROM_PROGRAM = 1 << MODE_ROM_PROGRAM,
+       PERMITTION_ALL = 0xffff
+};
 //¤³¤ì¤é¤Îʸ»úÎó¤Ï script.c ¤Ç¤â»ÈÍѤ¹¤ë
 const char OPSTR_CPU_ROMSIZE[] = "CPU_ROMSIZE";
 const char OPSTR_CPU_RAMSIZE[] = "CPU_RAMSIZE";