removed trash. updated libriary system

Author: AlexanderBazarov

README.md

@@ -17,12 +17,11 @@ Ponyscript comes with its own compiler, enabling easy transformation of Ponyscri
 ## Example Code
 
 ```ponyscript
-using libspace std; 
 
-num magic->>(int argc, char *argv[])
+int magic(int argc, char *argv[])
 {
-	string a = replaceAll->>("Sample string", "Sample", "pony");
-	neigh->>(a);
+	string a = "Hello Equestria";
+	neighln(a);
 }
 ```
 

compiler.py

@@ -8,7 +8,9 @@
 from logs import *
 from datetime import datetime
 from headergenerator import *
+
 try:
+    absp = os.path.abspath(__file__).replace("compiler.py", "")
 
     floader_dir = sys.argv[1]
 
@@ -105,10 +107,24 @@ def extract_additional_files(file_path):
                     for i in find_variables(tokens):
                         variables[i] = find_variables(tokens)[i]
 
+                    for i in includes:
+                        temptokens = lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.h", "r").read())
+                        tempvariables = find_variables(temptokens)
+                        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(lexical_analyzer(open(f"{absp}lib/{i.strip()}/{i.strip()}.h", "r").read()))
+                        for j in tempclasses:
+                            classes.append(j)
+
                     print_log("Translation")
 
                     tokens = translate_tokens(updated_tokens, variables, classes)
@@ -130,16 +146,17 @@ def extract_additional_files(file_path):
             if cfgline.split("=")[0].strip() == "[File Name]":
                 settings["filename"] = cfgline.split("=")[1].strip()
 
-    absp = os.path.abspath(__file__).replace("compiler.py", "")
 
-    lib = "/lib" #Эта фигня нужна для дебага, gcc переодически теряет файлы в каталого lib. "/lib" - значение для каталога lib
-    try:
-        shutil.rmtree(f"{bin_dir}{lib}") #Удаляем каталог lib, если он существует
-    except: pass
-    try:
-        os.mkdir(f"{bin_dir}{lib}")
-    except FileExistsError:
-        pass
+
+    lib = "" #Эта фигня нужна для дебага, gcc переодически теряет файлы в каталого lib. "/lib" - значение для каталога lib
+    if lib != "":
+        try:
+            shutil.rmtree(f"{bin_dir}{lib}") #Удаляем каталог lib, если он существует
+        except: pass
+        try:
+            os.mkdir(f"{bin_dir}{lib}")
+        except FileExistsError:
+            pass
 
     print_log("Copying built in libriaries")
 
@@ -154,8 +171,8 @@ def extract_additional_files(file_path):
 
     print_log("Copying additional built in libriaries")
     for i in includes:
-        shutil.copy(f"{absp}lib/{i.strip()}.cpp", bin_dir + lib)
-        shutil.copy(f"{absp}lib/{i.strip()}.h", bin_dir + lib)
+        shutil.copy(f"{absp}lib/{i.strip()}/{i.strip()}.cpp", bin_dir + lib)
+        shutil.copy(f"{absp}lib/{i.strip()}/{i.strip()}.h", bin_dir + lib)
         buildfiles = buildfiles + f"{bin_dir}{lib}/{i}.cpp "
         buildfiles = buildfiles + f"{bin_dir}{lib}/{i}.h "
 
@@ -168,16 +185,15 @@ def extract_additional_files(file_path):
     print_log("Writing run.cpp")
 
     shutil.copy(f"{absp}lib/run.cpp", bin_dir+ lib)
-    for file in extract_additional_files(f"{floader_dir}/.ponycfg"):
-        buildfiles = buildfiles + file + " "
+
 
     print_log("Starting gcc compyler")
     print(f"{absp}ucrt64\\bin\\g++.exe -o {bin_dir}/{settings['filename']} -I {absp}lib -L {absp}lib/dlls -l ponylib -finput-charset=UTF-8 {buildfiles} -lws2_32")
 
     result = subprocess.run(f"{absp}ucrt64\\bin\\g++.exe -o {bin_dir}/{settings['filename']} -I {absp}lib -L {absp}lib/dlls -l ponylib -finput-charset=UTF-8 {buildfiles} -lws2_32", capture_output=True)
 
-    print(result.stdout)
-    # print_log(gccdocksparser.parse(result.stderr.decode()))
+    # print(result.stderr.decode())
+    print_log(gccdocksparser.parse(result.stderr.decode()))
 
     if result.returncode == 0:
         print_log("\n")

example.h

@@ -1,22 +1,22 @@
-[13:52:20] Compiler started
-[13:52:20] Bin directory already exists
-[13:52:20] Reading files in floader
-[13:52:20] Compiling file prog.psc
-[13:52:20] Lexical analysis
-[13:52:20] Variable analysis
-[13:52:20] Class analysis
-[13:52:20] Translation
-[13:52:20] Assembling code
-[13:52:20] Writing code to file
-[13:52:20] Finished compiling file prog.psc
-[13:52:20] Reading configuration file
-[13:52:20] Copying built in libriaries
-[13:52:20] Copying additional files
-[13:52:20] Copying additional built in libriaries
-[13:52:20] Building executable
-[13:52:20] Writing run.h
-[13:52:20] Writing run.cpp
-[13:52:20] Starting gcc compyler
-[13:52:23] 
+[19:56:45] Compiler started
+[19:56:45] Bin directory already exists
+[19:56:45] Reading files in floader
+[19:56:45] Compiling file prog.psc
+[19:56:45] Lexical analysis
+[19:56:45] Variable analysis
+[19:56:45] Class analysis
+[19:56:45] Translation
+[19:56:45] Assembling code
+[19:56:45] Writing code to file
+[19:56:45] Finished compiling file prog.psc
+[19:56:45] Reading configuration file
+[19:56:45] Copying built in libriaries
+[19:56:45] Copying additional files
+[19:56:45] Copying additional built in libriaries
+[19:56:45] Building executable
+[19:56:45] Writing run.h
+[19:56:45] Writing run.cpp
+[19:56:45] Starting gcc compyler
+[19:56:48] 
 
-[13:52:23] Compilation successful!
+[19:56:48] Compilation successful!

lastest.log

@@ -1,25 +1,51 @@
 #include <iostream>
 #include <filesystem>
 #include <format>
+#include <fstream>
 
 
 using namespace std;
 using std::filesystem::current_path;
 
 int main(int argc, char *argv[]){
 
-    bool launch = false;
-    
-    std::string path = argv[0];
-
     std::filesystem::path exePath = std::filesystem::absolute(std::filesystem::path(argv[0]));
 
     std::filesystem::path exeDir = exePath.parent_path();
 
     filesystem::path directoryPath = exeDir;
-    string stringpath = directoryPath.generic_string();
+    string stringpath = directoryPath.generic_string(); 
+
+    if (argv[0] == "version")
+    {
+
+        cout << "Version: 0.0.1 alpha" << endl;
+        return 0;
+    }
+
+
+    if (argv[0] == "libinfo")
+    {
+        std::ifstream file;
+        file.open(stringpath + "/lib/" + argv[1] + "/libinfo"); 
+        if (file.is_open())
+        {
+            string line;
+            while (getline(file, line))
+            {
+                cout << line << endl;
+            }
+        }
+
+        return 0;
+
+    }
+
+    
+    std::string path = argv[0];
 
     string command = stringpath + "/python/python.exe" + " " + stringpath + "/compiler.py" + " " + argv[1];
 
     system(command.c_str());
+    
 }

launcher/programm.cpp

@@ -1,13 +1,13 @@
 import re
-from lib.wordlist import wordlist
-from lib.constants import constants
-from lib.libs import libs
-from lib.classes import buildintclasses
+from wordlist import wordlist
+from libparser import parcse_libs
+
 replacements = wordlist
 
 variable_types = ['int', 'float', 'double', 'char', 'bool', 'string']
 list_types = ['List', 'PPair']
 
+libs = parcse_libs()
 
 def find_variables(tokens):
     variables = {}
@@ -40,7 +40,7 @@ def find_includes(tokens):
     for i in range(0, len(tokens)):
         if tokens[i] == 'friend':
             if tokens[i+1] in libs:
-                tokens[i+1] = f'"{libs[tokens[i+1]]}.h"'
+                tokens[i+1] = f'"{tokens[i+1]}.h"'
             else: tokens[i+1] = f'"{tokens[i+1]}.h"'
             includes.append(tokens[i+1])
 
@@ -67,15 +67,13 @@ def find_classes(tokens:list):
     return classes, tokens
 
 def translate_tokens(tokens, variables, classes:list):
-    for i in buildintclasses:
-        classes.append(i)
     includes = find_includes(tokens)
     for i in range(0, len(tokens)):
         try:
             if tokens[i] in variables:
-                print(tokens[i])
+                pass
             else:
-                if tokens[i+1] != '(' and tokens[i] not in variables and tokens[i] not in list_types and tokens[i] not in includes and tokens[i] != '\n' and tokens[i] not in ['+', '-', '*', '/', '=', '.', ',', ';', '(', ')', '[', ']', '{', '}', ':', '<', '>'] and not tokens[i].startswith('"') and not tokens[i].endswith('"') and not tokens[i].isdigit() and tokens[i] not in classes and tokens[i] not in constants and not tokens[i].startswith('<') and not tokens[i].endswith('>'):
+                if tokens[i+1] != '(' and tokens[i] not in variables and tokens[i] not in list_types and tokens[i] not in includes and tokens[i] != '\n' and tokens[i] not in ['+', '-', '*', '/', '=', '.', ',', ';', '(', ')', '[', ']', '{', '}', ':', '<', '>'] and not tokens[i].startswith('"') and not tokens[i].endswith('"') and not tokens[i].isdigit() and tokens[i] not in classes and not tokens[i].startswith('<') and not tokens[i].endswith('>'):
                     if tokens[i] in replacements:
                         tokens[i] = replacements[tokens[i]]
                     else: