mirror of
https://github.com/krgamestudios/Toy.git
synced 2026-04-15 14:54:07 +10:00
Squashed commit of the following:
commit 633500eeaf72e7e5aed90f3eb071f56d93e129eb Author: Kayne Ruse <kayneruse@gmail.com> Date: Fri Aug 9 23:16:55 2024 +1000 Please work... commit 4b524a27fd1fe11e02206853b84bdfb349be5bf9 Author: Kayne Ruse <kayneruse@gmail.com> Date: Fri Aug 9 22:57:07 2024 +1000 This is starting to get annoying. commit 5e16a87f6cef7ca9eb536bcc172fd4a184c20124 Author: Kayne Ruse <kayneruse@gmail.com> Date: Fri Aug 9 22:38:31 2024 +1000 Fixed workflow file Used this: https://rhysd.github.io/actionlint/ commit 7fd6dd610ee3e9327350859b047b0c4792e74f19 Author: Kayne Ruse <kayneruse@gmail.com> Date: Fri Aug 9 22:30:50 2024 +1000 Let's try again commit d83b42a894929f926ba5bf94dee8a2a495a4db86 Author: Kayne Ruse <kayneruse@gmail.com> Date: Fri Aug 9 22:27:36 2024 +1000 Reworked the CI Also checked over the new code.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "toy_common.h"
|
||||
|
||||
//defined separately, as compilation can take several seconds, invalidating the comparisons of __TIME__
|
||||
static const char* build = __DATE__ " " __TIME__ ";development branch";
|
||||
//defined separately, as compilation can take several seconds, invalidating the comparisons of the given macros
|
||||
static const char* build = __DATE__ " " __TIME__ ";incomplete dev branch";
|
||||
|
||||
const char* Toy_private_version_build() {
|
||||
return build;
|
||||
|
||||
@@ -28,10 +28,12 @@
|
||||
|
||||
#endif
|
||||
|
||||
//bytecode version specifiers
|
||||
//bytecode version specifiers, embedded as the header
|
||||
#define TOY_VERSION_MAJOR 2
|
||||
#define TOY_VERSION_MINOR 0
|
||||
#define TOY_VERSION_PATCH 0
|
||||
|
||||
//defined as a function, for technical reasons
|
||||
#define TOY_VERSION_BUILD Toy_private_version_build()
|
||||
TOY_API const char* Toy_private_version_build();
|
||||
|
||||
|
||||
@@ -51,13 +51,13 @@ typedef enum Toy_TokenType {
|
||||
TOY_TOKEN_LITERAL_STRING,
|
||||
|
||||
//math operators
|
||||
TOY_TOKEN_OPERATOR_PLUS,
|
||||
TOY_TOKEN_OPERATOR_MINUS,
|
||||
TOY_TOKEN_OPERATOR_ADD,
|
||||
TOY_TOKEN_OPERATOR_SUBTRACT,
|
||||
TOY_TOKEN_OPERATOR_MULTIPLY,
|
||||
TOY_TOKEN_OPERATOR_DIVIDE,
|
||||
TOY_TOKEN_OPERATOR_MODULO,
|
||||
TOY_TOKEN_OPERATOR_PLUS_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_MINUS_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_ADD_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_SUBTRACT_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_MULTIPLY_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_DIVIDE_ASSIGN,
|
||||
TOY_TOKEN_OPERATOR_MODULO_ASSIGN,
|
||||
@@ -66,17 +66,8 @@ typedef enum Toy_TokenType {
|
||||
TOY_TOKEN_OPERATOR_ASSIGN,
|
||||
|
||||
//logical operators
|
||||
TOY_TOKEN_OPERATOR_COMPARE,
|
||||
TOY_TOKEN_OPERATOR_NOT_COMPARE,
|
||||
TOY_TOKEN_OPERATOR_LESS,
|
||||
TOY_TOKEN_OPERATOR_GREATER,
|
||||
TOY_TOKEN_OPERATOR_LESS_COMPARE,
|
||||
TOY_TOKEN_OPERATOR_GREATER_COMPARE,
|
||||
TOY_TOKEN_OPERATOR_AND,
|
||||
TOY_TOKEN_OPERATOR_OR,
|
||||
TOY_TOKEN_OPERATOR_NOT,
|
||||
|
||||
//control operators
|
||||
TOY_TOKEN_OPERATOR_EQUAL,
|
||||
TOY_TOKEN_OPERATOR_NOT_EQUAL,_EQUAL
|
||||
TOY_TOKEN_OPERATOR_PAREN_LEFT,
|
||||
TOY_TOKEN_OPERATOR_PAREN_RIGHT,
|
||||
TOY_TOKEN_OPERATOR_BRACKET_LEFT,
|
||||
@@ -90,12 +81,12 @@ typedef enum Toy_TokenType {
|
||||
TOY_TOKEN_OPERATOR_QUESTION,
|
||||
TOY_TOKEN_OPERATOR_COLON,
|
||||
|
||||
TOY_TOKEN_OPERATOR_DOT,
|
||||
TOY_TOKEN_OPERATOR_CONCAT,
|
||||
TOY_TOKEN_OPERATOR_REST,
|
||||
TOY_TOKEN_OPERATOR_DOT, // .
|
||||
TOY_TOKEN_OPERATOR_CONCAT, // ..
|
||||
TOY_TOKEN_OPERATOR_REST, // ...
|
||||
|
||||
//unused operators
|
||||
TOY_TOKEN_OPERATOR_PIPE,
|
||||
TOY_TOKEN_OPERATOR_PIPE, // |
|
||||
|
||||
//meta tokens
|
||||
TOY_TOKEN_PASS,
|
||||
|
||||
Reference in New Issue
Block a user