Merge pull request #43 from Project-Llama/feat-fix(comments-strings)

Comments + Fixed Strings

Author: zanderlewis

examples/chatbot.llama

@@ -1,3 +1,9 @@
-use("llama3")
-prompt("Why is the sky blue?")
-chat()
+use("piglatin") // Load the Piglatin module
+prompt("Why is the sky blue?") /* Ask a question */
+
+// The chatbot will respond in pig latin
+chat()
+
+/*
+    Done! The chatbot will respond in pig latin.
+*/

llamascript/__init__.py

@@ -1,6 +1,5 @@
 __version__ = "1.0.0"
 
-import asyncio
 import ollama
 import logging
 import sys
@@ -34,6 +33,12 @@ def warning(message):
     )
 
 
+def info(message):
+    print(
+        f"{colorama.Fore.GREEN}{colorama.Style.BRIGHT}[INFO]{colorama.Style.RESET_ALL} {message}"
+    )
+
+
 # Set up logging
 logging.basicConfig(level=logging.WARNING)
 
@@ -54,6 +59,11 @@ def tokenize(self, text):
             ("COMMA", r","),  # Comma
             ("NEWLINE", r"\n"),  # Line endings
             ("SKIP", r"[ \t]+"),  # Skip over spaces and tabs
+            ("SLC", r"//.*"),  # Single-line comment e.g., // This is a comment
+            (
+                "MLC",
+                r"/\*(.|\n)*?\*/",
+            ),  # Multi-line comment e.g., /* This is a comment */
             ("MISMATCH", r"."),  # Any other character
         ]
         tok_regex = "|".join("(?P<%s>%s)" % pair for pair in token_specification)
@@ -69,6 +79,8 @@ def tokenize(self, text):
                 self.tokens.append(("NEWLINE", value))
             elif kind == "SKIP":
                 continue
+            elif kind == ("SLC" or "MLC"):
+                continue
             elif kind == "MISMATCH":
                 error(f"Invalid character: {value}")
                 sys.exit(1)
@@ -121,7 +133,10 @@ def arguments(self):
             self.current < len(self.tokens) and self.tokens[self.current][0] != "RPAREN"
         ):
             token = self.tokens[self.current]
-            if token[0] in {"STRING", "NUMBER"}:
+            if token[0] == "STRING":
+                args.append(token[1][1:-1])  # Strip surrounding quotes
+                self.current += 1
+            elif token[0] == "NUMBER":
                 args.append(token[1])
                 self.current += 1
             elif token[0] == "COMMA":
@@ -249,7 +264,7 @@ def create_model(self, filename, parameters, attributes):
                     stderr=subprocess.DEVNULL,
                 )
             stdout, stderr = process.communicate()
-            print("Model created.")
+            info("Model created.")
 
             if process.returncode != 0:
                 if stderr: