3.8 update !

Author: megat69

compiler.py

@@ -135,12 +135,29 @@
 
         while "<" in line and ">" in line:
             equation = line[line.find("<") + 1:line.find(">")]
-            new_equation = line[line.find("<") + 1:line.find(">")]
+            """new_equation = line[line.find("<") + 1:line.find(">")]
             while "{" in new_equation and "}" in new_equation:
                 variable = new_equation[new_equation.find("{") + 1:new_equation.find("}")]
                 new_equation = new_equation.replace("{"+variable+"}", variable)
+            line = line.replace("<"+equation+">", "{"+new_equation+"}")"""
+            new_equation = equation.replace("{", "")
+            new_equation = new_equation.replace("}", "")
             line = line.replace("<"+equation+">", "{"+new_equation+"}")
 
+        while len(re.findall("\{[a-zA-Z]*\[len\]\}", line)) > 0 and re.findall("\{[a-zA-Z]*\[len\]\}", line)[0] in line:
+            variable = line[line.find("{") + 1:line.find("[")]
+            full_var = re.findall("\{[a-zA-Z]*\[len\]\}", line)[0]
+            line = line.replace(str(full_var), "{len("+variable+")}")
+        while "[{" in line and "}]" in line:
+            variable = line[line.find("[") + 1:line.find("]")]
+            full_var = line[line.find("{") + 1:line.find("[")]
+            variable = variable.replace("{", "", 1)
+            variable = variable.replace("}", "", 1)
+            if variable == "len":
+                line = line.replace("{"+full_var+"[{"+variable+"}]}", "{len("+full_var+")}")
+            else:
+                line = line.replace("[{"+variable+"}]", "["+variable+"]", 1)
+
         if line.startswith("for"):
             indentation_required += 1
             line = remove_from_string(line, ["{", "}"])
@@ -230,6 +247,8 @@
                     var_type = 'int'
                 elif line.startswith(":float"):
                     var_type = 'float'
+                elif line.startswith(":list"):
+                    var_type = 'list'
                 else:
                     var_type = 'str'
                 line = line.replace(":"+var_type, "", 1)
@@ -256,7 +275,7 @@
                 if line.startswith(" "):
                     line = line.replace(" ", "", 1)
 
-            line = line.split(" ")  # Result : [name, "=", content]
+            line = line.split(" ")  # Result : [name, var_operator, content]
 
             if var_parameters is not None:
                 line.pop(0)
@@ -294,6 +313,54 @@
                               f"The variable \"{variable}\" is not existing or has been declared later in the code.")
                 do_regroup = False
 
+            elif var_type == "list":
+                # Recombination of line vars in a single line
+                for i in range(3, len(line)):
+                    line[2] = line[2] + " " + line[i]
+
+                # Initializing list elements
+                list_elements = []
+                if "list." not in line[2]:
+                    while "[" in line[2] and "]" in line[2]:
+                        errors_count = 0
+                        variable = line[2][line[2].find("[") + 1:line[2].find("]")]
+                        debug("other", lineno(), f"List element {variable} found.")
+                        try:
+                            line[2] = line[2].replace("[" + variable + "]", "")
+                        except KeyError:
+                            error(line_numbers, "ArgumentError",
+                                  f"An error occured while trying to parse the list \"{line[0]}\".")
+                            errors_count += 1
+                        if errors_count >= 10:
+                            print(
+                                f"\n\n{bcolors.FAIL}Debug has chosen to stop this program due to too many errors. Sorry for the inconvenicence.{bcolors.ENDC}")
+                            line_numbers = len(code_lines)
+                            break
+                        list_elements.append(variable)
+                    # Dememorizing 'variable'
+                    variable = None
+
+                    line[2] = list_elements
+                    var_type = "list"
+                    do_regroup = False
+                elif line[2].startswith("list.add"):
+                    line[2] = line[2].replace("list.add ", "", 1)
+                    line[2] = remove_suffix(line[2], line[2].endswith("\n"))
+                    line = line[0]+".append(f\""+line[2]+"\")"
+                    do_regroup = False
+                elif line[2].startswith("list.insert"):
+                    line[2] = line[2].replace("list.insert ", "", 1)
+                    index = re.findall("\d*", str(line[2]))[0]
+                    line[2] = line[2].replace(index+" ", "", 1)
+                    line[2] = remove_suffix(line[2], line[2].endswith("\n"))
+                    line = line[0]+".insert("+index+", f\""+line[2]+"\")"
+                    do_regroup = False
+                elif line[2].startswith("list.remove"):
+                    line[2] = line[2].replace("list.remove ", "", 1)
+                    index = re.findall("\d*", str(line[2]))[0]
+                    line = line[0]+".pop("+index+")"
+                    do_regroup = False
+
             else:
                 try:
                     if "." not in str(line[2]):
@@ -306,11 +373,13 @@
                     except ValueError:
                         line[2] = str(line[2])
 
+
             if do_regroup:
                 for i in range(3, len(line)):
                     line[2] += " "+line[i]
 
-            if not isinstance(line[2], bool):
+
+            if not isinstance(line[2], bool) and not isinstance(line[2], list):
                 try:
                     line[2] = int(line[2])
                 except ValueError:
@@ -319,7 +388,8 @@
                     except ValueError:
                         pass
 
-            if isinstance(line[2], str) and not line[2].startswith("input") and not line[2].startswith("randint"):
+
+            if isinstance(line[2], str) and not line[2].startswith("input") and not line[2].startswith("randint") and not isinstance(line, str):
                 line[2] = remove_suffix(line[2], line[2].endswith("\n"))
                 line[2] = "f\""+line[2]+"\""
 
@@ -337,10 +407,14 @@
             elif var_action == "ceil":
                 line[2] = f"ceil({line[2]})"
 
-            if var_type is not None:
-                line = line[0] + " = " + var_type + "(" + str(line[2]) + ")"
+            if ("append" in line or "insert" in line or "pop" in line) and var_type == "list":
+                line = line
+            elif var_type == "list":
+                line = line[0] + " " + line[1] + " " + str(line[2])
+            elif var_type is not None:
+                line = line[0] + " " + line[1] + " " + var_type + "(" + str(line[2]) + ")"
             else:
-                line = line[0] + " = " + str(line[2])
+                line = line[0] + " " + line[1] + " " + str(line[2])
 
         elif line.startswith("pause"):
             line = line.replace("pause ", "", 1)

console.py

@@ -6,6 +6,7 @@
 import requests
 import platform
 import shlex
+import webbrowser
 
 running = True
 ini_file = "startup.acpl-ini"
@@ -77,19 +78,34 @@
 
     debug("in", lineno(), user_input)
 
+    og_user_input = user_input
+
+    if user_input == "redo":
+        user_input = last_user_input
+
     if user_input.lower() == "end":
         print(f"{bcolors.OKBLUE}{texts.console['process-ended']}{bcolors.ENDC}")
         break
 
     elif user_input.startswith("run"):
-        user_input = user_input.replace("run ", "")
-        replace_line('startup.acpl-ini', 0, 'filename: ' + user_input + "\n")
-        if not user_input.endswith(".acpl"):
-            user_input += ".acpl"
+        if user_input == "run":
+            user_input = open_file_dialog(extensions="acpl")
+            if user_input is not None:
+                replace_line('startup.acpl-ini', 0, 'filename: ' + user_input + "\n")
+            else:
+                print(f"{bcolors.FAIL}Cannot run this file.{bcolors.ENDC}")
+                continue
+        else:
+            user_input = user_input.replace("run ", "")
+            replace_line('startup.acpl-ini', 0, 'filename: ' + user_input + "\n")
+            if not user_input.endswith(".acpl"):
+                user_input += ".acpl"
+
         print(f"{bcolors.OKBLUE}{texts.console['launch-code-file'].format(user_input)}{bcolors.ENDC}")
         sleep(1.7)
         os.system("python main.py")
 
+
     elif user_input.startswith("rerun"):
         print(f"{bcolors.OKBLUE}Running last file again...{bcolors.ENDC}")
         sleep(1.7)
@@ -163,6 +179,9 @@
         else:
             output = texts.console_modify_ini["unable-to-modify-option"]
 
+    elif user_input.lower().startswith("doc"):
+        webbrowser.open("https://github.com/megat69/ACPL/blob/master/README.md")
+
     elif user_input.lower() == "help":
         print(texts.console_help["available-commands"] + " :")
         print(f"\t- 'end' : {texts.console_help['end']}\n"
@@ -226,12 +245,22 @@
             raise CriticError
 
     elif user_input.startswith("compile"):
-        user_input = user_input.replace("compile ", "", 1)
-        user_input = user_input.split(" ")
-        if len(user_input) == 1:
-            user_input.append(user_input[0]+".py")
-        if not user_input[0].endswith(".acpl"):
-            user_input[0] += ".acpl"
+        if user_input == "compile":
+            user_input = open_file_dialog(extensions="acpl")
+            if user_input is not None:
+                user_input = [user_input, user_input]
+            else:
+                continue
+        else:
+            user_input = user_input.replace("compile ", "", 1)
+            user_input = user_input.split(" ")
+            if len(user_input) == 1:
+                user_input = [user_input[0], user_input[0]]
+            if not user_input[0].endswith(".acpl"):
+                user_input[0] += ".acpl"
+            if ("." in user_input[0] and not user_input[0].endswith(".acpl")) or ("." in user_input[1] and not user_input[1].endswith(".acpl")):
+                print(f"{bcolors.FAIL}Unable to compile that kind of file (extension '.{user_input[0].split('.')[1]}').")
+                continue
         replace_line('startup.acpl-ini', 0, 'filename: '+user_input[0]+"\n")
         replace_line("startup.acpl-ini", 8, "compiled-file-filename: "+user_input[1]+"\n")
         os.system("python compiler.py")
@@ -300,6 +329,7 @@
 
     else:
         output = texts.console["unknown-command"]
+    last_user_input = og_user_input
 
     if output is not None:
         print(f"{bcolors.WARNING}{texts.console['output'].upper()} :{bcolors.ENDC}\n{output}")

ide.py

@@ -80,9 +80,14 @@ def trigger_autocomplete():
 
 print(f"{bcolors.OKBLUE}ACPL IDE successfully opened.{bcolors.ENDC}")
 
+# Part removed on 29/11/2020
+# Action : File opening in command line.
+# Replaced by dialog box.
+"""
 code_file_filename = input(f"{bcolors.OKBLUE}Enter code file filename : {bcolors.ENDC}")
 if not code_file_filename.endswith(".acpl") and "." not in code_file_filename:
     code_file_filename += ".acpl"
+
 if code_file_filename.startswith("ACPL_IDE_NEW "):
     user_input = code_file_filename.replace("ACPL_IDE_NEW ", "", 1)
     if os.path.exists(user_input):
@@ -105,6 +110,8 @@ def trigger_autocomplete():
     code_file_filename = input(f"{bcolors.FAIL}Sorry, this file ({code_file_filename}) doesn't exist. Can you retry ?\nEnter the code file filename : {bcolors.ENDC}")
     if not code_file_filename.endswith(".acpl"):
         code_file_filename += ".acpl"
+"""
+code_file_filename = open_file_dialog()
 
 print("\n\n")
 
@@ -197,6 +204,8 @@ def trigger_autocomplete():
             displayed_lines[i] += bcolors.ENDC
         print(displayed_lines[i])
 
+    if loop_times[1] > 10:
+        loop_times[1] = 10
     print(f"{bcolors.OKBLUE}{loop_times[1]} lines displayed out of {len(lines)}.{bcolors.ENDC}")
 
     # Collect events until released
@@ -213,6 +222,12 @@ def trigger_autocomplete():
             except IndexError:
                 temp_line = [""]
             temp_line.insert(current_cursor_position, pressed_key)
+            if pressed_key == "{":
+                temp_line.insert(current_cursor_position+1, "}")
+            elif pressed_key == "<":
+                temp_line.insert(current_cursor_position+1, ">")
+            elif pressed_key == "[":
+                temp_line.insert(current_cursor_position + 1, "]")
             try:
                 lines[current_line] = ""
             except IndexError: