krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked TOY_EXPORT omitting extra repl stuff

Browse Source
This commit is contained in:
Kayne Ruse
2023-03-15 04:56:26 +11:00
parent f2f8aed23a
commit a04d2c4816
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@@ -28,10 +28,10 @@ library: $(TOY_OUTDIR)
static: $(TOY_OUTDIR) static: $(TOY_OUTDIR)
$(MAKE) -j8 -C source static $(MAKE) -j8 -C source static
library-release: $(TOY_OUTDIR) library-release: clean $(TOY_OUTDIR)
$(MAKE) -j8 -C source library-release $(MAKE) -j8 -C source library-release
static-release: $(TOY_OUTDIR) static-release: clean $(TOY_OUTDIR)
$(MAKE) -j8 -C source static-release $(MAKE) -j8 -C source static-release
#utils #utils

6
source/toy_common.c
View File

@@ -4,7 +4,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
//test variable sizes based on platform //test variable sizes based on platform - see issue #35
#define STATIC_ASSERT(test_for_true) static_assert((test_for_true), "(" #test_for_true ") failed") #define STATIC_ASSERT(test_for_true) static_assert((test_for_true), "(" #test_for_true ") failed")
STATIC_ASSERT(sizeof(char) == 1); STATIC_ASSERT(sizeof(char) == 1);
@@ -15,6 +15,8 @@ STATIC_ASSERT(sizeof(unsigned char) == 1);
STATIC_ASSERT(sizeof(unsigned short) == 2); STATIC_ASSERT(sizeof(unsigned short) == 2);
STATIC_ASSERT(sizeof(unsigned int) == 4); STATIC_ASSERT(sizeof(unsigned int) == 4);
#ifndef TOY_EXPORT
//declare the singleton with default values //declare the singleton with default values
Toy_CommandLine Toy_commandLine = { Toy_CommandLine Toy_commandLine = {
.error = false, .error = false,
@@ -134,3 +136,5 @@ void Toy_copyrightCommandLine(int argc, const char* argv[]) {
printf("2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n\n"); printf("2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n\n");
printf("3. This notice may not be removed or altered from any source distribution.\n\n"); printf("3. This notice may not be removed or altered from any source distribution.\n\n");
} }
#endif

6
source/toy_common.h
View File

@@ -28,7 +28,9 @@
#endif #endif
//for processing the command line arguments #ifndef TOY_EXPORT
//for processing the command line arguments in the repl
typedef struct { typedef struct {
bool error; bool error;
bool help; bool help;
@@ -51,3 +53,5 @@ TOY_API void Toy_initCommandLine(int argc, const char* argv[]);
TOY_API void Toy_usageCommandLine(int argc, const char* argv[]); TOY_API void Toy_usageCommandLine(int argc, const char* argv[]);
TOY_API void Toy_helpCommandLine(int argc, const char* argv[]); TOY_API void Toy_helpCommandLine(int argc, const char* argv[]);
TOY_API void Toy_copyrightCommandLine(int argc, const char* argv[]); TOY_API void Toy_copyrightCommandLine(int argc, const char* argv[]);
#endif

5
source/toy_interpreter.c
View File

@@ -12,12 +12,17 @@
#include <string.h> #include <string.h>
static void printWrapper(const char* output) { static void printWrapper(const char* output) {
//allow for disabling of newlines in the repl
#ifndef TOY_EXPORT
if (Toy_commandLine.enablePrintNewline) { if (Toy_commandLine.enablePrintNewline) {
printf("%s\n", output); printf("%s\n", output);
} }
else { else {
printf("%s", output); printf("%s", output);
} }
#else
printf("%s\n", output);
#endif
} }
static void assertWrapper(const char* output) { static void assertWrapper(const char* output) {