Improve app.rc

Author: AntoineLandrieux

Makefile

@@ -28,36 +28,46 @@ CFLAGS += -Wextra
 CFLAGS += -Wno-unused-result
 CFLAGS += -Wno-unused-parameter
 CFLAGS += -Wno-implicit-fallthrough
+CFLAGS += -O2
 
 ifeq ($(OS), Windows_NT)
+
 WINDRES = windres
-RES = $(BIN)/res.o
+RC = windows/resources/app.rc
+RES = $(BIN)/resources.res
+
 else
+
 WINDRES = echo
+
 endif
 
 SOARE_FLAGS :=
 SOARE_FLAGS += -D __SOARE_COLORED_OUTPUT
-# SOARE_FLAGS += -D __SOARE_DEBUG 
+# SOARE_FLAGS += -D __SOARE_DEBUG
 
 default: $(BIN)/$(APP)
 
 $(LIB)/libsoare$(VERSION_MAJOR).a: $(CORE_OBJS)
 
 CORE_OBJS := $(patsubst $(CORE)/%.c, $(LIB)/%.o, $(wildcard $(CORE)/*.c))
 
+$(BIN):
+	mkdir $(BIN)
+
 $(LIB):
-	mkdir -p $(LIB)
+	mkdir $(LIB)
+
+$(RES):
+	$(WINDRES) $(RC) -O coff -o $(RES)
 
 $(LIB)/%.o: $(CORE)/%.c
 	$(CC) -c $< -o $@ -I $(INCLUDE) $(CFLAGS) $(SOARE_FLAGS)
 
-$(BIN)/$(APP): $(LIB) $(CORE_OBJS) $(SRC)/Main.c
-	mkdir -p $(BIN)
-	$(WINDRES) windows/resources/app.rc -coff $(RES)
+$(BIN)/$(APP): $(BIN) $(LIB) $(RES) $(CORE_OBJS)
 	$(AR) rcs $(LIB)/libsoare$(VERSION_MAJOR).a $(CORE_OBJS)
 	$(CC) $(RES) $(SRC)/*.c -o $(BIN)/$(APP) -I $(INCLUDE) -L$(LIB) -lsoare$(VERSION_MAJOR) $(CFLAGS) $(SOARE_FLAGS)
-	rm $(CORE_OBJS) $(RES)
+	rm $(CORE_OBJS)
 
 run:
 	$(BIN)/$(APP)

core/Math.c

@@ -356,17 +356,19 @@ static char *Array(char *value, AST array)
  */
 char *Math(AST tree)
 {
-    long double dx, dy;
-    char *sx, *sy;
-    char *result = NULL;
-
-    MEM get = NULL;
-
     switch (tree->type)
     {
-    case NODE_MEMGET:
+    case NODE_VALUE:
+
+        return strdup(tree->value);
 
-        get = MemGet(MEMORY, tree->value);
+    case NODE_CALL:
+
+        return RunFunction(tree);
+
+    case NODE_MEMGET:
+    {
+        MEM get = MemGet(MEMORY, tree->value);
 
         if (!get)
             return LeaveException(UndefinedReference, tree->value, tree->file);
@@ -375,19 +377,12 @@ char *Math(AST tree)
             return LeaveException(VariableDefinedAsFunction, tree->value, tree->file);
 
         return strdup(get->value);
-
-    case NODE_CALL:
-
-        return RunFunction(tree);
-
-    case NODE_VALUE:
-
-        return strdup(tree->value);
+    }
 
     case NODE_OPERATOR:
-
-        sx = Eval(tree->child);
-        sy = Eval(tree->child->sibling);
+    {
+        char *sx = Eval(tree->child);
+        char *sy = Eval(tree->child->sibling);
 
         if (!sx || !sy)
         {
@@ -396,6 +391,8 @@ char *Math(AST tree)
             return NULL;
         }
 
+        char *result = NULL;
+
         switch (*(tree->value))
         {
         case ',':
@@ -424,8 +421,9 @@ char *Math(AST tree)
             break;
         }
 
-        dx = strtold(sx, &result);
-        dy = strtold(sy, &result);
+        long double dx = strtold(sx, &result);
+        long double dy = strtold(sy, &result);
+
         free(sx);
         free(sy);
 
@@ -434,11 +432,13 @@ char *Math(AST tree)
 
         switch (*(tree->value))
         {
+        // < or <=
         case '<':
-            return __boolean(dx < dy || (dx == dy && tree->value[1] == '='));
+            return __boolean(dx < dy || (tree->value[1] == '=' && dx == dy));
 
+        // > or >=
         case '>':
-            return __boolean(dx > dy || (dx == dy && tree->value[1] == '='));
+            return __boolean(dx > dy || (tree->value[1] == '=' && dx == dy));
 
         case '&':
             return __boolean(dx && dy);
@@ -467,6 +467,7 @@ char *Math(AST tree)
         default:
             return LeaveException(MathError, tree->value, tree->file);
         }
+    }
 
     default:
         return LeaveException(MathError, tree->value, tree->file);

core/Runtime.c

@@ -340,7 +340,6 @@ static char *Runtime(AST tree)
 int Execute(char *__restrict__ file, char *__restrict__ rawcode)
 {
     if (!MEMORY)
-        // Set default vars..
         MEMORY = Mem();
 
     // Clear interpreter exception

windows/resources/app.rc

@@ -1 +1,30 @@
-soare ICON "../../resources/icon/icon.ico"
+SOARE ICON "../../resources/icon/icon.ico"
+
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3fL
+FILEFLAGS 0x0L
+FILEOS 0x4L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904b0"
+    BEGIN
+      VALUE "CompanyName", "Antoine LANDRIEUX"
+      VALUE "FileDescription", "SOARE Interpreter"
+      VALUE "FileVersion", "1.0.0"
+      VALUE "InternalName", "SOARE"
+      VALUE "LegalCopyright", "MIT License (c) 2024-2025 Antoine LANDRIEUX"
+      VALUE "OriginalFilename", "soare.exe"
+      VALUE "ProductName", "SOARE"
+      VALUE "ProductVersion", "1.0.0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1200
+  END
+END