Changeset 364 in dev for trunk/abdev/ProjectEditor

Timestamp:

Nov 11, 2007, 3:12:06 PM (16 years ago)

Author:

dai_9181

Message:

Throw→Catch間のパラメータ引渡しに対応。
グローバル領域でのTryスコープを可能にした。これで例外処理機構実装完了。
エディタの補間機能にTry/Catch/Finally/EndTryを追加。

Location:

trunk/abdev/ProjectEditor

Files:

• Common.h (modified) (1 diff)
• EndPairCommandComplement.cpp (modified) (3 diffs)
• SubOperation.cpp (modified) (4 diffs)
• TextEditor_KeyEvent.cpp (modified) (3 diffs)

trunk/abdev/ProjectEditor/Common.h

@@ -66 +66 @@
 #define APPLICATION_NAME "ActiveBasic 5.0"
 #define VERSION_APPLI_NAME APPLICATION_NAME
-#define VERSION_STRING "5.00.00 (rev.356)"
+#define VERSION_STRING "5.00.00 (rev.375)"
 
 #endif

trunk/abdev/ProjectEditor/EndPairCommandComplement.cpp

@@ -75 +75 @@
     if(lstrcmpi(temporary,"Select")==0) return COM_SELECT;
     if(lstrcmpi(temporary,"Sub")==0) return COM_SUB;
+    if(lstrcmpi(temporary,"Try")==0) return COM_TRY;
     if(lstrcmpi(temporary,"Type")==0) return COM_TYPE;
     if(lstrcmpi(temporary,"While")==0) return COM_WHILE;
@@ -150 +151 @@
             lstrcpy(buffer,"End Sub");
             break;
+        case COM_TRY:
+            lstrcpy(buffer,"End Try");
+            break;
         case COM_TYPE:
             lstrcpy(buffer,"End Type");
@@ -317 +321 @@
         ComplementWndInfo.pMemberInfo[1].dwProc=0;
         ComplementWndInfo.pMemberInfo[1].dwAccess=ACCESS_PAIRCOMMAND;
+    }
+    else if(CmdId==COM_TRY){
+        ComplementWndInfo.pMemberInfo=(MEMBERINFO *)HeapAlloc(hHeap,0,sizeof(MEMBERINFO)*4);
+        ComplementWndInfo.MemberNum=3;
+
+        ComplementWndInfo.pMemberInfo[0].pName=(char *)HeapAlloc(hHeap,0,10);
+        lstrcpy(ComplementWndInfo.pMemberInfo[0].pName,"End Try");
+        ComplementWndInfo.pMemberInfo[0].dwProc=0;
+        ComplementWndInfo.pMemberInfo[0].dwAccess=ACCESS_PAIRCOMMAND;
+
+        ComplementWndInfo.pMemberInfo[1].pName=(char *)HeapAlloc(hHeap,0,10);
+        lstrcpy(ComplementWndInfo.pMemberInfo[1].pName,"Catch");
+        ComplementWndInfo.pMemberInfo[1].dwProc=0;
+        ComplementWndInfo.pMemberInfo[1].dwAccess=ACCESS_PAIRCOMMAND;
+
+        ComplementWndInfo.pMemberInfo[2].pName=(char *)HeapAlloc(hHeap,0,8);
+        lstrcpy(ComplementWndInfo.pMemberInfo[2].pName,"Finally");
+        ComplementWndInfo.pMemberInfo[2].dwProc=0;
+        ComplementWndInfo.pMemberInfo[2].dwAccess=ACCESS_PAIRCOMMAND;
     }
     else{

trunk/abdev/ProjectEditor/SubOperation.cpp

@@ -439 +439 @@
         case COM_SELECT:
         case COM_SUB:
+        case COM_TRY:
         case COM_TYPE:
         case COM_TYPEDEF:
@@ -465 +466 @@
     }
     else if(str[0]=='c'||str[0]=='C'){
+        if(lstrcmpi(str,"Catch")==0) return -1;
         if(lstrcmpi(str,"Case")==0) return -1;
         if(lstrcmp(str,"Char")==0) return -1;
@@ -508 +510 @@
         if(lstrcmp(str,"False")==0) return -1;
         if(lstrcmpi(str,"Field")==0) return COM_FIELD;
+        if(lstrcmpi(str,"Finally")==0) return -1;
         if(lstrcmpi(str,"For")==0) return COM_FOR;
         if(lstrcmpi(str,"Function")==0) return COM_FUNCTION;
@@ -583 +586 @@
         if(lstrcmpi(str,"Then")==0) return -1;
         if(lstrcmpi(str,"This")==0) return -1;
+        if(lstrcmpi(str,"Throw")==0) return -1;
         if(lstrcmp(str,"True")==0) return -1;
+        if(lstrcmp(str,"Try")==0) return COM_TRY;
         if(lstrcmpi(str,"Type")==0) return COM_TYPE;
         if(lstrcmpi(str,"TypeDef")==0) return COM_TYPEDEF;

trunk/abdev/ProjectEditor/TextEditor_KeyEvent.cpp

@@ -82 +82 @@
         lstrcmpi(temporary,"Private")==0||
         lstrcmpi(temporary,"Protected")==0||
-        lstrcmpi(temporary,"Public")==0
+        lstrcmpi(temporary,"Public")==0||
+
+        lstrcmpi(temporary,"Try")==0||
+        lstrcmpi(temporary,"Catch")==0||
+        lstrcmpi(temporary,"Finally")==0
         ) return 1;
     else if(lstrcmpi(temporary,"Select")==0) return 2;
@@ -135 +139 @@
         lstrcmpi(temporary,"Private")==0||
         lstrcmpi(temporary,"Protected")==0||
-        lstrcmpi(temporary,"Public")==0
+        lstrcmpi(temporary,"Public")==0||
+
+        lstrcmpi(temporary,"Catch")==0||
+        lstrcmpi(temporary,"Finally")==0
         ) return 1;
     else if(lstrcmpi(temporary,"EndSelect")==0) return 2;
@@ -816 +823 @@
     if(
         pobj_nv->BackNum_PairStatementComplement&&
-        (nVirtualKey=='c'||nVirtualKey=='C'||       //Case
+        (nVirtualKey=='c'||nVirtualKey=='C'||       //Case、Catch
         nVirtualKey=='e'||nVirtualKey=='E'||        //End ～
+        nVirtualKey=='f'||nVirtualKey=='F'||        //Finally
         nVirtualKey=='l'||nVirtualKey=='L'||        //Loop
         nVirtualKey=='n'||nVirtualKey=='N'||        //Next