Merge pull request #84 from Robotnik08/development

Development

Author: Robotnik08

README.md

@@ -2,7 +2,7 @@
   <img src="assets/dosato_logo_wide.png">
 </p>
 
-# Dosato version 0.6.6
+# Dosato version 0.6.7
 
 cDosato is the official implementation of the DOSATO programming language.<br>
 

SECURITY.md

@@ -6,8 +6,8 @@ All versions in the release section are supported
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.6.6   | :white_check_mark: |
-| < 0.6.6 | :x:                |
+| 0.6.7   | :white_check_mark: |
+| < 0.6.7 | :x:                |
 
 ## Reporting a Vulnerability
 

demo/oop.to

@@ -8,7 +8,7 @@ class Person (name, age) {
 }
 
 class Student (name, age, grade) {
-    set self += Person(name, age)
+    inherit Person(name, age)
     set self->grade = grade
 
     implement sayGrade () {

dosato_api/dosato.h

@@ -113,6 +113,7 @@ typedef enum {
     E_INVALID_AMOUNT_SET_EXPRESSION,
     E_INVALID_IDENTIFIER,
     E_NOT_ITERABLE,
+    E_MASTER_MUST_BE_IN_CLASS,
 
     // standard library errors
     E_FILE_NOT_FOUND,
@@ -306,30 +307,30 @@ extern void free_ValueArray(ValueArray* array);
 extern void destroyValueArray(ValueArray* array);
 
 extern void init_ValueObject(ValueObject* object);
-extern void write_ValueObject(ValueObject* object, char* key, Value value);
+extern void write_ValueObject(ValueObject* object, Value key, Value value);
 extern void free_ValueObject(ValueObject* object);
 
 /**
  * @brief Checks if an object has a key.
  * @param object The object to check.
  * @param key The key to check for.
  */
-extern bool hasKey(ValueObject* object, char* key);
+extern bool hasKey(ValueObject* object, Value key);
 
 /**
  * @brief Gets the value at a specific key in an object.
  * @param object The object to get the value from.
  * @param key The key to get the value from.
  * @return The value at the key, or NULL if the key does not exist.
  */
-extern Value* getValueAtKey(ValueObject* object, char* key);
+extern Value* getValueAtKey(ValueObject* object, Value key);
 
 /**
  * @brief Removes a key from an object, this does safely destroy the value and the key of the object.
  * @param object The object to remove the key from.
  * @param key The key to remove.
  */
-extern void removeFromKey(ValueObject* object, char* key);
+extern void removeFromKey(ValueObject* object, Value key);
 
 /// virtual-machine.h
 /// This part of the library is responsible for handling virtual machine gc generation and running.

include/code_instance.h

@@ -64,6 +64,8 @@ typedef enum {
     OP_BINARY_RANGE_UP_INCLUSIVE,
     OP_BINARY_RANGE_DOWN_INCLUSIVE,
     OP_BINARY_NULL_COALESCE,
+    OP_BINARY_STRICT_EQUAL,
+    OP_BINARY_STRICT_NOT_EQUAL,
 
     OP_UNARY_NEGATE,
     OP_UNARY_LOGICAL_NOT,
@@ -117,6 +119,11 @@ typedef enum {
     // Super Instructions
     OP_STORE_FAST_POP,
     OP_STORE_FAST_CONSTANT,
+    OP_STORE_FAST_POP_CONSTANT,
+    OP_STORE_FAST_FORCED,
+
+    OP_DEFINE_CONSTANT,
+    OP_DEFINE_POP_CONSTANT,
 
     OP_TEMP // temporary opcode for swapping
 

include/common.h

@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif
 
-#define DOSATO_VERSION "0.6.6"
+#define DOSATO_VERSION "0.6.7"
 #ifndef DOSATO_DATE
     #define DOSATO_DATE "Unknown date"
 #endif

include/error.h

@@ -67,6 +67,7 @@ typedef enum {
     E_INVALID_AMOUNT_SET_EXPRESSION,
     E_INVALID_IDENTIFIER,
     E_NOT_ITERABLE,
+    E_MASTER_MUST_BE_IN_CLASS,
 
     // standard library errors
     E_FILE_NOT_FOUND,

include/node.h

@@ -22,6 +22,7 @@ typedef enum {
     NODE_MASTER_IMPLEMENT,
     NODE_MASTER_ENUM,
     NODE_MASTER_IF,
+    NODE_MASTER_INHERIT,
 
     NODE_MASTER_DO_BODY,
     NODE_MASTER_MAKE_BODY,
@@ -38,6 +39,7 @@ typedef enum {
     NODE_MASTER_IMPLEMENT_BODY,
     NODE_MASTER_ENUM_BODY,
     NODE_MASTER_IF_BODY,
+    NODE_MASTER_INHERIT_BODY,
 
 
     NODE_WHEN_BODY,

include/standard_libraries/std_array.h

@@ -32,5 +32,11 @@ Value array_every(ValueArray args, bool debug);
 Value array_count(ValueArray args, bool debug);
 Value array_sum(ValueArray args, bool debug);
 Value array_find(ValueArray args, bool debug);
+Value array_combinations(ValueArray args, bool debug);
+void combinationUtil(Value* arr, int n, int r, int index, int* data, int i, ValueArray* new_array);
+Value array_permutations(ValueArray args, bool debug);
+void permutationUtil(Value* arr, int n, int r, int index, int* data, bool* used, ValueArray* new_array);
+Value array_remove_duplicates(ValueArray args, bool debug);
+Value array_length(ValueArray args, bool debug);
 
 #endif // STD_ARRAY_H

include/standard_libraries/std_math.h

@@ -24,5 +24,8 @@ Value math_acos(ValueArray args, bool debug);
 Value math_atan(ValueArray args, bool debug);
 Value math_atan2(ValueArray args, bool debug);
 Value math_exp(ValueArray args, bool debug);
+Value math_digits(ValueArray args, bool debug);
+Value math_gdc(ValueArray args, bool debug);
+Value math_lcm(ValueArray args, bool debug);
 
 #endif // STD_MATH_H