From 839ab5fc40d0bbca65f273e555292d0af83ad661 Mon Sep 17 00:00:00 2001
From: Zengtudor <Zengtudor@outlook.com>
Date: Fri, 18 Jul 2025 21:25:22 +0800
Subject: [PATCH] update

---
 include/Interpreter.hpp | 52 +++++++++++++++++++++++++++++++++--------
 include/Lexer.hpp       |  4 ++--
 include/Tools.hpp       |  3 ++-
 src/main.cpp            | 21 ++++++++++++++++-
 tests/main.ztl          |  7 +++---
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/include/Interpreter.hpp b/include/Interpreter.hpp
index fb152dc..eb0e89f 100644
--- a/include/Interpreter.hpp
+++ b/include/Interpreter.hpp
@@ -36,7 +36,7 @@ namespace ztl{
             ObjectType a=getValueOrLiteral(i);
             ObjectType b;
             if(i+1<tokens.size()&&tokens[i+1].type==TokenType::Operator){
-                if(tokens[i+1].str=="+"){
+                if(tokens[i+1].type==TokenType::Operator){
                     if(i+2<tokens.size()){
                         b=getValueOrLiteral(i+2);
                     }else{
@@ -49,14 +49,29 @@ namespace ztl{
                 return {a,1};
             }
             ObjectType res;
-            if(std::holds_alternative<int64_t>(a) && tokens[i+1].str=="+" && std::holds_alternative<int64_t>(b)){
-                res = std::get<int64_t>(a) + std::get<int64_t>(b);
+            if(std::holds_alternative<int64_t>(a) && std::holds_alternative<int64_t>(b)){
+                if(tokens[i+1].str=="+"){
+                    res = std::get<int64_t>(a) + std::get<int64_t>(b);
+                }else if(tokens[i+1].str=="-"){
+                    res = std::get<int64_t>(a) - std::get<int64_t>(b);
+                }
+                else{
+                    throw std::runtime_error(std::format("unknown operator '{}' ",tokens[i+1].str));
+                }
             }else{
-                throw std::runtime_error(std::format("unknown operator '{}' or value type '{}' ,'{}'",tokens[i+1].str,tokens[i].str,tokens[i+2].str));
+                throw std::runtime_error(std::format("unknown value type '{}' ,'{}'",tokens[i].str,tokens[i+2].str));
             }
+            
             return {res,3};
         };
         for(size_t i=0;i<tokens.size();i++){
+            const auto eat = [&i,&tokens](const std::string &s){
+                if(i+1<tokens.size()&&tokens[i+1].str==s){
+                    i++;
+                }else{
+                    throw std::runtime_error(std::format("cannot get '{}' after '{}'",s,tokens[i].str));
+                }
+            };
             if(tokens[i].type==TokenType::Keyword){
                 if(tokens[i].str=="int"){
                     if( i+2<tokens.size()
@@ -71,8 +86,8 @@ namespace ztl{
                     }else{
                         throw std::runtime_error(std::format("error when creatting int value '{}'",tokens[i].str));
                     }
-                    
-                }else if(tokens[i].str=="print"){
+                }
+                else if(tokens[i].str=="print"){
                     if(i+1<tokens.size()&&tokens[i+1].str=="("){
                         i++;
                     }else{
@@ -93,14 +108,31 @@ namespace ztl{
                 else{
                     throw std::runtime_error(std::format("interpreter error Cannot find Keyword '{}'",tokens[i].str));
                 }
-                if(i+1<tokens.size()&&tokens[i+1].str==";"){
-                    i++;
+                
+            }else if(tokens[i].type==TokenType::Identifier){
+                if( i+1<tokens.size()
+                    && tokens[i+1].str=="="
+                ){
+                    std::string valueName = tokens[i].str;
+                    i+=1;
+                    auto res = getExprAns(i+1);
+                    if(auto it = objects.find(valueName);it!=objects.end()){
+                        if(it->second.index()!=res.first.index()){
+                            throw std::runtime_error(std::format("cannot give value to {}, because type is not same",valueName));
+                        }
+                    }else{
+                        throw std::runtime_error(std::format("error when getting int value named '{}'",valueName));
+                    }
+                    objects[valueName] = res.first;
+                    i+=res.second;
                 }else{
-                    throw std::runtime_error(std::format("cannot get ';' after '{}'",tokens[i].str));
+                    throw std::runtime_error(std::format("error when creatting int value '{}'",tokens[i].str));
                 }
-            }else{
+            }
+            else{
                 throw std::runtime_error(std::format("interpreter error at '{}'",tokens[i].str));
             }
+            eat(";");
         }
     }
 }
\ No newline at end of file
diff --git a/include/Lexer.hpp b/include/Lexer.hpp
index 8f28590..9c67e0f 100644
--- a/include/Lexer.hpp
+++ b/include/Lexer.hpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 namespace ztl{
-    
+
     namespace readFileToStrType{
         struct CannotOpenFile{};
         using ReturnType = std::variant<
@@ -97,7 +97,7 @@ namespace ztl{
                 }
                 else if(isspace(s[i])){
                     continue;
-                }else if(s[i]=='='||s[i]=='+'){
+                }else if(s[i]=='='||s[i]=='+'||s[i]=='-'){
                     tokens.emplace_back(TokenType::Operator,std::string()+s[i]);
                 }else if(isdigit(s[i])){
                     size_t begin = i;
diff --git a/include/Tools.hpp b/include/Tools.hpp
index 91f3d1f..adaa623 100644
--- a/include/Tools.hpp
+++ b/include/Tools.hpp
@@ -23,6 +23,7 @@ namespace std{
     }
 }
 namespace ztl {
+    inline bool isDebug = false;
     template<class ...Ts>
     struct overloaded : Ts... {using Ts::operator()...;};
     template<class ...Ts>
@@ -39,7 +40,7 @@ namespace ztl {
         }
     },ztl::readFileToStr(v));
 
-    std::cout<<"Lexer() return vector:\n"<<lexer.tokens<<'\n';
+    if(isDebug)std::cout<<"Lexer() return vector:\n"<<lexer.tokens<<'\n';;
     ztl::interpreter(lexer.tokens);
 }
 }
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 9f18b1a..d2fe2ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,11 +1,30 @@
 #include "Tools.hpp"
+#include <iostream>
 #include <stdexcept>
+#include <string>
 #include <string_view>
 
+const std::string usageInfo = R"(Usage : ztl <filepath>
+        -v to print the version
+        -d to print the debug info 
+)";
+
+void printUsage(){
+    std::cout<<usageInfo<<'\n';
+}
 
 int main(int argc,char *argv[]){
     if(argc<2){
-        throw std::runtime_error("Usage : ztl <filepath>");
+        throw std::runtime_error(usageInfo);
+    }
+    for(int i=0;i<argc;i++){
+        if(std::string(argv[i])=="-v"){
+            std::cout<<"Tudor Lang version alpha 0.1 by Zengtudor\nhttps://gitcode.com/Zengtudor/TudorLang\n";
+        }else if(std::string(argv[i])=="-h"){
+            printUsage();
+        }else if(std::string(argv[i])=="-d"){
+            ztl::isDebug=true;
+        }
     }
     ztl::runCodeFromPath(argv[1]);
 }
\ No newline at end of file
diff --git a/tests/main.ztl b/tests/main.ztl
index bf88165..6fb0c90 100644
--- a/tests/main.ztl
+++ b/tests/main.ztl
@@ -1,5 +1,6 @@
-int a =1 +100;
+int a = 1;
 print(a);
-int a = a+5;
+a=a+1;
 print(a);
-print(a+a);
\ No newline at end of file
+print(a-2);
+print(a);
\ No newline at end of file