diff --git a/include/pocketpy/objects/sourcedata.h b/include/pocketpy/objects/sourcedata.h index 67c35f8c..7f8d7cc0 100644 --- a/include/pocketpy/objects/sourcedata.h +++ b/include/pocketpy/objects/sourcedata.h @@ -8,10 +8,10 @@ extern "C" { #include "pocketpy/common/str.h" #include "pocketpy/common/vector.h" -enum pkpy_CompileMode { PK_EXEC_MODE, PK_EVAL_MODE, PK_REPL_MODE, PK_JSON_MODE, PK_CELL_MODE }; +enum CompileMode { EXEC_MODE, EVAL_MODE, REPL_MODE, JSON_MODE, CELL_MODE }; struct pkpy_SourceData { - enum pkpy_CompileMode mode; + enum CompileMode mode; bool is_precompiled; pkpy_Str filename; @@ -21,7 +21,7 @@ struct pkpy_SourceData { c11_vector _precompiled_tokens; // contains "pkpy_Str" }; -void pkpy_SourceData__ctor(struct pkpy_SourceData *self, const char *source, int source_size, const pkpy_Str *filename, enum pkpy_CompileMode mode); +void pkpy_SourceData__ctor(struct pkpy_SourceData *self, const char *source, int source_size, const pkpy_Str *filename, enum CompileMode mode); void pkpy_SourceData__dtor(struct pkpy_SourceData* self); bool pkpy_SourceData__get_line(const struct pkpy_SourceData *self, int lineno, const char **st, const char **ed); diff --git a/include/pocketpy/objects/sourcedata.hpp b/include/pocketpy/objects/sourcedata.hpp index 1ccf8141..2295e294 100644 --- a/include/pocketpy/objects/sourcedata.hpp +++ b/include/pocketpy/objects/sourcedata.hpp @@ -6,16 +6,6 @@ namespace pkpy { -using CompileMode = pkpy_CompileMode; - -enum { - EXEC_MODE = PK_EXEC_MODE, - EVAL_MODE = PK_EVAL_MODE, - REPL_MODE = PK_REPL_MODE, - JSON_MODE = PK_JSON_MODE, - CELL_MODE = PK_CELL_MODE, -}; - struct SourceData : public pkpy_SourceData { SourceData(std::string_view source, const Str& filename, CompileMode mode) { pkpy_SourceData__ctor(this, source.data(), source.size(), &filename, mode); diff --git a/src/common/sourcedata.c b/src/common/sourcedata.c index bb204e66..40929655 100644 --- a/src/common/sourcedata.c +++ b/src/common/sourcedata.c @@ -10,7 +10,7 @@ void pkpy_SourceData__ctor(struct pkpy_SourceData* self, const char* source, int source_size, const pkpy_Str* filename, - enum pkpy_CompileMode mode) { + enum CompileMode mode) { self->filename = pkpy_Str__copy(filename); // OPTIMIZEME? self->mode = mode;