updated binary file, fixed bugs with classes

Author: AlexanderBazarov

compiler.py

@@ -109,31 +109,32 @@ def extract_additional_files(file_path):
                             includes.append(i)
 
 
+                    print_log("Class analysis")
+                    classes_list, updated_tokens = find_classes(tokens)
+                    for i in classes_list:
+                        classes.append(i)
+
+                    for i in includes:
+                        tempclasses, temptokens = find_classes(remove_comments(lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.h", "r").read())))
+                        for j in tempclasses:
+                            classes.append(j)
+
 
                     print_log("Variable analysis")
-                    for i in find_variables(tokens):
-                        variables[i] = find_variables(tokens)[i]
+                    for i in find_variables(tokens, classes):
+                        variables[i] = find_variables(tokens, classes)[i]
                     print(variables)
 
 
                     for i in includes:
                         temptokens = lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.h", "r").read())
                         temptokens = remove_comments(temptokens)
-                        tempvariables = find_variables(temptokens)
+                        tempvariables = find_variables(temptokens, classes)
                         for j in tempvariables:
                             variables[j] = tempvariables[j]
 
 
 
-                    print_log("Class analysis")
-                    classes_list, updated_tokens = find_classes(tokens)
-                    for i in classes_list:
-                        classes.append(i)
-
-                    for i in includes:
-                        tempclasses, temptokens = find_classes(remove_comments(lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.h", "r").read())))
-                        for j in tempclasses:
-                            classes.append(j)
 
                     print_log("Namespace analysys")
                     for i in find_namespaces(tokens):
@@ -260,9 +261,9 @@ def extract_additional_files(file_path):
     print(f"{absp}ucrt64\\bin\\g++.exe -o {bin_dir}/{settings['filename']} {objectfiles} -L{absp}lib -I{absp}lib -lponylib -finput-charset=UTF-8 -lstdc++ ")
     compiler = subprocess.run(f"{absp}ucrt64\\bin\\g++.exe -o {bin_dir}/{settings['filename']} {objectfiles} -I{absp}lib -I{bin_dir}/lib -L{absp}lib  -lponylib -finput-charset=UTF-8 -lstdc++ ", capture_output=True)
 
-    # for i in os.listdir(bin_dir):
-    #     if i.split('.')[-1] == 'o':
-    #         os.remove(bin_dir + "/" + i)
+    for i in os.listdir(bin_dir):
+        if i.split('.')[-1] == 'o':
+            os.remove(bin_dir + "/" + i)
 
     if compiler.returncode == 0:
         print_log("Compilation successful!") 

lastest.log

@@ -1,26 +1,26 @@
-[23:28:55] Compiler started
-[23:28:55] Bin directory already exists
-[23:28:55] Reading files in floader
-[23:28:55] Compiling file prog.psc
-[23:28:55] Lexical analysis
-[23:28:55] Variable analysis
-[23:28:55] Class analysis
-[23:28:55] Namespace analysys
-[23:28:55] Translation
-[23:28:55] Assembling code
-[23:28:55] Writing code to file
-[23:28:55] Finished compiling file prog.psc
-[23:28:55] Reading configuration file
-[23:28:55] Copying built in libriaries
-[23:28:55] Copying additional files
-[23:28:55] Copying additional built-in libriaries
-[23:28:55] Building executable
-[23:28:55] Writing run.h
-[23:28:55] Writing run.cpp
-[23:28:55] Starting gcc compyler
-[23:28:55] Compiling c:/pony/bin/prog.cpp
-[23:28:56] Compiling c:/pony/bin/lib/run.cpp
-[23:28:57] Compiling c:/pony/bin/lib/testlib.cpp
-[23:28:57] Compiling c:/pony/bin/lib/math.cpp
-[23:28:57] Compiling c:/pony/bin/lib/datetime.cpp
-[23:28:58] Compilation successful!
+[18:02:45] Compiler started
+[18:02:45] Bin directory already exists
+[18:02:45] Reading files in floader
+[18:02:45] Compiling file prog.psc
+[18:02:45] Lexical analysis
+[18:02:45] Class analysis
+[18:02:45] Variable analysis
+[18:02:45] Namespace analysys
+[18:02:45] Translation
+[18:02:45] Assembling code
+[18:02:45] Writing code to file
+[18:02:45] Finished compiling file prog.psc
+[18:02:45] Reading configuration file
+[18:02:45] Copying built in libriaries
+[18:02:45] Copying additional files
+[18:02:45] Copying additional built-in libriaries
+[18:02:45] Building executable
+[18:02:45] Writing run.h
+[18:02:45] Writing run.cpp
+[18:02:45] Starting gcc compyler
+[18:02:45] Compiling c:/pony/bin/prog.cpp
+[18:02:47] Compiling c:/pony/bin/lib/run.cpp
+[18:02:48] Compiling c:/pony/bin/lib/testlib.cpp
+[18:02:48] Compiling c:/pony/bin/lib/math.cpp
+[18:02:49] Compiling c:/pony/bin/lib/datetime.cpp
+[18:02:50] Compilation successful!

launcher/programm.cpp

@@ -2,11 +2,24 @@
 #include <filesystem>
 #include <format>
 #include <fstream>
-
+#include <string>
+#include <cctype>
 
 using namespace std;
 using std::filesystem::current_path;
 
+std::string strip(const std::string &inpt)
+{
+    auto start_it = inpt.begin();
+    auto end_it = inpt.rbegin();
+    while (std::isspace(*start_it))
+        ++start_it;
+    while (std::isspace(*end_it))
+        ++end_it;
+    return std::string(start_it, end_it.base());
+}
+
+
 int main(int argc, char *argv[]){
 
     std::filesystem::path exePath = std::filesystem::absolute(std::filesystem::path(argv[0]));
@@ -16,18 +29,17 @@ int main(int argc, char *argv[]){
     filesystem::path directoryPath = exeDir;
     string stringpath = directoryPath.generic_string(); 
 
-    if (argv[0] == "version")
+    if (strip(argv[1]) == "version")
     {
 
-        cout << "Version: 0.0.1 alpha" << endl;
+        cout << "Version: 0.0.2 alpha" << endl;
         return 0;
     }
 
-
-    if (argv[0] == "libinfo")
+    if (strip(argv[1]) == "libinfo")
     {
         std::ifstream file;
-        file.open(stringpath + "/lib/" + argv[1] + "/libinfo"); 
+        file.open(stringpath + "/lib/" + strip(argv[2]) + "/libinfo"); 
         if (file.is_open())
         {
             string line;
@@ -41,7 +53,6 @@ int main(int argc, char *argv[]){
 
     }
 
-    
     std::string path = argv[0];
 
     string command = stringpath + "/python/python.exe" + " " + stringpath + "/compiler.py" + " " + argv[1];

lexer.py

@@ -10,7 +10,7 @@
 
 libs, psclibs = parcse_libs()
 
-def find_variables(tokens):
+def find_variables(tokens, classes):
     variables = {}
     for i in range(0, len(tokens)):
         if tokens[i] in variable_types:
@@ -29,6 +29,12 @@ def find_variables(tokens):
                 j += 1
             variables[tokens[i+j]] = tokens[i]
 
+        elif tokens[i] in classes:
+            j = 1
+            while tokens[i + j] == '*':
+                j += 1
+            variables[tokens[i+j]] = tokens[i]
+
     return variables
 
 def get_libs(tokens):
@@ -78,13 +84,13 @@ def find_classes(tokens:list):
                 if tokens[i+j] == '{':
                     insert_indexes.append(i+j+1) 
 
-    # updated_tokens = tokens
-    # for i in insert_indexes:
-    #     tokens.insert(i, '\n')
-    #     tokens.insert(i+1, 'public:')
+    updated_tokens = tokens
+    for i in insert_indexes:
+        tokens.insert(i, '\n')
+        tokens.insert(i+1, 'public:')
 
 
-    return classes, tokens
+    return classes, updated_tokens
 
 
 def find_namespaces(tokens:list):

lextree.py

@@ -82,14 +82,16 @@ def assemble_tokens(treelist, indent=0):
 
 from lexer import *
 tokens = (lexical_analyzer(open("C:\pony\prog.psc", "r").read()))
-variables = find_variables(tokens)
 classes, tokens = find_classes(tokens)
-
-translated = translate_tokens(tokens=tokens, variables=variables, classes=classes)
+variables = find_variables(tokens, classes)
+includes = get_libs(tokens)
+namespaces = find_namespaces(tokens)
+tokens = format_strings(tokens)
+translated = translate_tokens(tokens=tokens, variables=variables, classes=classes, includes=includes, namespaces=namespaces)
 tree = build_tree(translated)
 tree_list = tree_to_list(tree)
 
-print(assemble_tokens(nested_lists(tree_list)))
+print(nested_lists(tree_list))
 # assemble_tokens(tree_list)
 
 # print(nested_lists(translated))

libbuilder.py

@@ -28,7 +28,7 @@ def get_libs(tokens):
 
     return includes
 
-def find_variables(tokens):
+def find_variables(tokens, classes):
     variables = {}
     for i in range(0, len(tokens)):
         if tokens[i] in variable_types:
@@ -46,6 +46,12 @@ def find_variables(tokens):
             while tokens[i + j] == '*':
                 j += 1
             variables[tokens[i+j]] = tokens[i]
+        
+        elif tokens[i] in classes:
+            j = 1
+            while tokens[i + j] == '*':
+                j += 1
+            variables[tokens[i+j]] = tokens[i]
 
     return variables
 
@@ -158,8 +164,8 @@ def assemble_code(tokens):
 def build_lib(libname):
     i = libname
     lib_tokens = lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.psc", "r").read())
-    lib_variables = find_variables(lib_tokens)
     lib_classes = find_classes(lib_tokens)[0]
+    lib_variables = find_variables(lib_tokens, lib_classes)
     lib_namespaces = find_namespaces(lib_tokens)
     tokens = translate_tokens(lib_tokens, lib_variables, lib_classes, lib_namespaces)
     tokens = format_strings(tokens)
@@ -168,8 +174,8 @@ def build_lib(libname):
         file.write(assembled_code)
 
     lib_tokens = lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.psh", "r").read())
-    lib_variables = find_variables(lib_tokens)
     lib_classes = find_classes(lib_tokens)[0]
+    lib_variables = find_variables(lib_tokens, lib_classes)
     lib_namespaces = find_namespaces(lib_tokens)
     tokens = translate_tokens(lib_tokens, lib_variables, lib_classes, lib_namespaces)
     tokens = format_strings(tokens)

pony.exe

@@ -1,9 +0,0 @@
-from lexer import *
-
-tokens = lexical_analyzer(open('C:/pony/prog.psc', 'r').read())
-
-variables = find_variables(tokens)
-classes, tokens = find_classes(tokens)
-
-print(assemble_code(translate_tokens(tokens, variables, classes)))
-