1

source/Compile/FileMeta/FileMetaMemberMethod.cs

@@ -279,6 +279,10 @@ public bool ParseFunction(List<Node> nodeList)
                 Console.WriteLine("Error 解析位置 Token: " + m_Token?.ToLexemeAllString() );
                 return false;
             }
+            if( isError )
+            {
+                Console.WriteLine("ParseFunction 解析函数");
+            }
             m_VirtualOverrideToken = virtualToken;            
             m_PermissionToken = permissionToken;
             m_StaticToken = staticToken;

source/Core/MetaCommon.cs

@@ -1093,9 +1093,9 @@ public MetaFunctionCall GetMetaFunctionCall()
                     return mfc;
                 }
             }
-            else if( m_CallNodeType == ECallNodeType.NewClass )
-            {
-            }
+            //else if( m_CallNodeType == ECallNodeType.NewClass )
+            //{
+            //}
             return null;
         }
         public MetaType GetMetaDefineType()
@@ -1493,7 +1493,7 @@ private void CreateCallLinkNode()
                 Console.WriteLine("Error 连接串没有找到合适的节点  360!!!");
             }
         }
-        public int GetCodeFileLine() { return 0; }
+        public Token GetToken() { return null; }
         public bool Parse( AllowUseConst _useConst )
         {
             allowUseConst = new AllowUseConst(_useConst);

source/Core/MetaExpressBase.cs

@@ -52,8 +52,7 @@ public virtual int opLevel
         protected MetaClass m_OwnerMetaClass = null;
         protected MetaBlockStatements m_OwnerMetaBlockStatements = null;
         protected MetaType m_MetaDefineType = null;
-        public virtual int GetCodeFileLine() { return 0; }
-        public virtual string GetFilePath() { return ""; }
+        public virtual Token GetToken() { return null; }
         public virtual int CalcParseLevel(int level) { return level; }
         public virtual void CalcReturnType() {  }
         public virtual void Parse(AllowUseConst auc) { }

source/Core/MetaExpressCalllink.cs

@@ -36,7 +36,7 @@ public override void Parse( AllowUseConst auc )
                 m_MetaCallLink.Parse( auc );
             }
         }
-        public override int GetCodeFileLine() { if (m_MetaCallLink != null) { return m_MetaCallLink.GetCodeFileLine(); } else return 0; }
+        public override Token GetToken() { return m_MetaCallLink.GetToken(); }
         public override int CalcParseLevel(int level)
         {
             if (m_MetaCallLink != null)

source/Core/MetaExpressConst.cs

@@ -114,7 +114,7 @@ public override MetaType GetReturnMetaDefineType()
             {
                 return m_MetaDefineType;
             }
-            MetaType mdt = null;
+            //MetaType mdt = null;
             MetaClass mc = CoreMetaClassManager.GetMetaClassByEType(eType);
             MetaInputTemplateCollection mitc = new MetaInputTemplateCollection();
             if( eType == EType.Array )
@@ -129,7 +129,7 @@ public override MetaType GetReturnMetaDefineType()
             }
             return m_MetaDefineType;
         }
-        public override int GetCodeFileLine() { if (m_FileMetaConstValueTerm?.token != null) { return m_FileMetaConstValueTerm.token.sourceBeginLine; } else return 0; }
+        public override Token GetToken() { return m_FileMetaConstValueTerm?.token; }
         public void ComputeAddRight(MetaConstExpressNode right)
         {
             switch (right.eType)

source/Core/MetaExpressNewObject.cs

@@ -703,13 +703,13 @@ private void Init()
                 }
             }
         }
-        public override int GetCodeFileLine()
+        public override Token GetToken()
         {
             if(m_FileMetaConstValueTerm  != null)
             {
-                return m_FileMetaConstValueTerm.token.sourceBeginLine;
+                return m_FileMetaConstValueTerm.token;
             }
-            return base.GetCodeFileLine();
+            return base.GetToken();
         }
         public override void Parse(AllowUseConst auc)
         {

source/Core/MetaExpressOperator.cs

@@ -306,13 +306,13 @@ public void SetRight(MetaExpressNode _right)
         {
             m_Right = _right;
         }
-        public override int GetCodeFileLine()
+        public override Token GetToken()
         {
             if (m_FileMetaBaseTerm != null)
             {
-                return m_FileMetaBaseTerm.token.sourceBeginLine;
+                return m_FileMetaBaseTerm.token;
             }
-            return base.GetCodeFileLine();
+            return base.GetToken();
         }
         public override void Parse(AllowUseConst auc)
         {

source/Core/MetaMemberFunction.cs

@@ -226,13 +226,13 @@ public override void SetDeep(int deep)
             m_Deep = deep;
             m_MetaBlockStatements?.SetDeep(deep);
         }
-        public override int GetCodeFileLine()
+        public override Token GetToken()
         {
             if( m_FileMetaMemberFunction?.finalToken != null )
             {
-                return m_FileMetaMemberFunction.finalToken.sourceBeginLine;
+                return m_FileMetaMemberFunction.finalToken;
             }
-            return base.GetCodeFileLine();
+            return base.GetToken();
         }
         public bool IsEqualWithMMFByNameAndParam( MetaMemberFunction mmf )
         {

source/Core/MetaParam.cs

@@ -268,13 +268,13 @@ public MetaDefineParam( string _name, MetaClass ownerMC, MetaBlockStatements mbs
             m_MetaVariable.SetFromMetaDefineParamCreate(this);
             m_MetaVariable.isArgument = true;
         }
-        public int GetCodeFileLine()
+        public Compile.Token GetToken()
         {
             if(m_FileMetaParamter != null )
             {
-                return m_FileMetaParamter.token.sourceBeginLine;
+                return m_FileMetaParamter.token;
             }
-            return 0;
+            return null;
         }
         public override void Parse()
         {            
@@ -742,6 +742,10 @@ public MetaClass GetMaxLevelMetaClassType()
                     }
                 }
             }
+            if(isAllSame )
+            {
+                Console.WriteLine("全都相似");
+            }
             return mc;
         }
         public override string ToFormatString()

source/Core/MetaVariable.cs

@@ -6,6 +6,7 @@
 //  Description:  all variable 's define, if it's iterator style then use IteratorMetaVariable, other custom same style!
 //****************************************************************************
 
+using SimpleLanguage.Compile;
 using SimpleLanguage.Core.SelfMeta;
 using SimpleLanguage.Core.Statements;
 using System;
@@ -129,21 +130,21 @@ public virtual string ToStatementString()
         {
             return "";
         }
-        public virtual int GetCodeFileLine()
+        public virtual Token GetToken()
         {
             if(m_FromMetaNewStatementsCreate != null )
             {
-                return m_FromMetaNewStatementsCreate.GetCodeFileLine();
+                return m_FromMetaNewStatementsCreate.GetToken();
             }
             if( m_FromMetaDefineParamCreate != null )
             {
-                return m_FromMetaDefineParamCreate.GetCodeFileLine();
+                return m_FromMetaDefineParamCreate.GetToken();
             }
             if(m_FromExpressNodeCreate != null )
             {
-                return m_FromExpressNodeCreate.GetCodeFileLine();
+                return m_FromExpressNodeCreate.GetToken();
             }
-            return 0;
+            return null;
         }
         public override string ToFormatString()
         {

source/Core/Statements/MetaNewStatements.cs

@@ -54,21 +54,21 @@ public MetaNewStatements( MetaBlockStatements mbs, FileMetaCallSyntax callSyntax
             m_OwnerMetaBlockStatements.AddOnlyNameMetaVariable(m_Name);
             Parse();
         }
-        public int GetCodeFileLine()
+        public Compile.Token GetToken()
         {
             if (m_FileMetaDefineVariableSyntax != null)
             {
-                return m_FileMetaDefineVariableSyntax.token.sourceBeginLine;
+                return m_FileMetaDefineVariableSyntax.token;
             }
             if (m_FileMetaOpAssignSyntax != null)
             {
-                return m_FileMetaOpAssignSyntax.assignToken.sourceBeginLine;
+                return m_FileMetaOpAssignSyntax.assignToken;
             }
             if (m_FileMetaCallSyntax != null)
             {
-                return m_FileMetaCallSyntax.token.sourceBeginLine;
+                return m_FileMetaCallSyntax.token;
             }
-            return 0;
+            return null;
         }
         private void Parse()
         {

source/IR/IRBase.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml.Linq;
 
 namespace SimpleLanguage.IR
 {
@@ -29,18 +30,33 @@ protected IRBase( IRMethod irMethod )
         }
         public void AddIRData( IRData irData )
         {
+            if( irData ==  null )
+            {
+                return;
+            }
             m_IRDataList.Add(irData);
         }
-        public virtual void SetCodeFileLine( int line )
+        public void AddIRRangeData( IEnumerable<IRData> ienumData )
         {
-
+            foreach( var v in ienumData )
+            {
+                if (v == null)
+                {
+                    continue;
+                }
+                m_IRDataList.Add(v);
+            }
         }
         public virtual string ToIRString()
         {
             StringBuilder sb = new StringBuilder();
 
-            for( int i = 0; i < m_IRDataList.Count; i++ )
+            for (int i = 0; i < m_IRDataList.Count; i++)
             {
+                if (this.m_IRDataList[i] == null)
+                {
+                    continue;
+                }
                 sb.AppendLine(m_IRDataList[i].ToString());
             }
             return sb.ToString();

source/IR/IRBrach.cs

@@ -6,50 +6,52 @@
 //  Description: 
 //****************************************************************************
 
+using SimpleLanguage.Compile;
 using SimpleLanguage.Compile.CoreFileMeta;
 using SimpleLanguage.Core;
 using SimpleLanguage.IR;
 using SimpleLanguage.VM;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 namespace SimpleLanguage.IR
 {
     public class IRBranch : IRBase
     {
-        public IRData brData = new IRData();
+        public IRData data = new IRData();
         public IRBranch( IRMethod _irMethod, EIROpCode type, IRData brIRData )
         {
-            brData.opCode = type;
-            brData.opValue = brData;
+            data.opCode = type;
+            data.opValue = brIRData;
+            AddIRData( data );
         }
         public void SetOpValue(IRData opValue)
         {
-            brData.opValue = opValue;
+            data.opValue = opValue;
         }
-        public override void SetCodeFileLine(int line)
+        public void SetDebugInfoByToken(Token token)
         {
-            brData.line = line;
+            data.SetDebugInfoByToken(token);
         }
         public override string ToIRString()
         {
             StringBuilder sb = new StringBuilder();
 
-            sb.Append("branch");
             sb.Append(base.ToIRString());
 
             return sb.ToString();
         }
     }
     public class IRLabel : IRBase
     {
-        IRData labelIRData = new IRData();
+        IRData data = new IRData();
         public IRLabel(IRMethod _irMethod, string _label, bool isGogo )
         {
-            labelIRData = new IRData();
-            labelIRData.opCode = isGogo ? EIROpCode.Label : EIROpCode.BrLabel;
-            labelIRData.opValue = _label;
+            data = new IRData();
+            data.opCode = isGogo ? EIROpCode.Label : EIROpCode.BrLabel;
+            data.opValue = _label;
         }
         public override string ToIRString()
         {