Changeset 214 for trunk/VSlickMacros/kdev.e

Timestamp:

Jan 12, 2005, 9:19:35 PM (21 years ago)

Author:

bird

Message:

use tagging to get args.

File:

• trunk/VSlickMacros/kdev.e (modified) (76 diffs)

trunk/VSlickMacros/kdev.e

@@ -79 +79 @@
 #pragma option(redeclvars, on)
 #include 'slick.sh'
+#ifndef VS_TAGDETAIL_context_args
+/* newer vslick version. */
+#include 'tagsdb.sh'
+//#pragma option(strict,on)
+/*#else: Version 4.0 (OS/2) */
+#endif
 
 /* Remeber to change these! */
@@ -117 +123 @@
     i = pos("/", date);
     j = pos("/", date, i+1);
-    month = substr(date, 1, i-1);
+    _str month = substr(date, 1, i-1);
     if (length(month) == 1) month = '0'month;
-    day   = substr(date, i+1, j-i-1);
+    _str day   = substr(date, i+1, j-i-1);
     if (length(day)   == 1) day   = '0'day;
-    year  = substr(date, j+1);
+    _str year  = substr(date, j+1);
     return year"-"month"-"day;
 }
@@ -132 +138 @@
 static _str k_year()
 {
-    date = _date('U');
+    _str date = _date('U');
     return  substr(date, pos("/",date, pos("/",date)+1)+1, 4);
 }
@@ -172 +178 @@
      * Get comment setup from the lexer.
      */
+    _str sLine = '';
     if (sLexer)
     {
-        sLine = '';
         /* multiline */
         rc = _ini_get_value(slick_path_search("user.vlx"), sLexer, 'mlcomment', sLine);
@@ -196 +202 @@
             sRight = '';
             iColumn = 0;
-            sTmp = word(sLine, 2);
+            _str sTmp = word(sLine, 2);
             if (isnumber(sTmp))
                 iColumn = (int)sTmp;
@@ -207 +213 @@
      * Read the nonboxchars and determin user or default box.ini.
      */
-    sFile = slick_path_search("ubox.ini");
-    frc = _ini_get_value(sFile, sExt, 'nonboxchars', sLine);
+    _str sFile = slick_path_search("ubox.ini");
+    boolean frc = _ini_get_value(sFile, sExt, 'nonboxchars', sLine);
     if (frc)
     {
-        sFile = slick_path_search("box.ini")
+        sFile = slick_path_search("box.ini");
         frc = _ini_get_value(sFile, sExt, 'nonboxchars', sLine);
     }
@@ -252 +258 @@
 {
     _str    sRight = '';
+    _str    sLeft = '';
+    int     iColumn;
     boolean fLineComment = false;
     if (k_commentconfig(sLeft, sRight, iColumn))
@@ -284 +292 @@
     }
 
+    int iCol = 0;
     if (iColumn <= 0)
     {   /*
@@ -334 +343 @@
 static _str k_comment(boolean fRight = false)
 {
-    sComment = '/*';
+    _str sLeft, sRight;
+    int iColumn;
+    _str sComment = '/*';
     if (k_commentconfig(sLeft, sRight, iColumn))
         sComment = (!fRight || iColumn > 0 ? sLeft : sRight);
@@ -352 +363 @@
 static void k_box_start(sTag)
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -359 +372 @@
            _insert_text(" ");
 
-    sText = sLeft;
+    _str sText = sLeft;
     if (sTag != '' && fkStyleBoxTag)
     {
@@ -367 +380 @@
     }
 
+    int i;
     for (i = length(sText); i <= ikStyleWidth - p_col; i++)
         sText = sText:+'*';
@@ -381 +395 @@
 static void k_box_line(_str sStr)
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -387 +403 @@
            _insert_text(" ");
 
-    sText = '';
+    _str sText = '';
     if (k_line_comment())
         sText = sLeft;
@@ -394 +410 @@
 
     sText = sText:+' ';
+    int i;
     for (i = length(sText); i < p_SyntaxIndent; i++)
         sText = sText:+' ';
@@ -412 +429 @@
 static void k_box_end()
 {
+    _str sLeft, sRight;
+    int iColumn, i;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -418 +437 @@
            _insert_text(" ");
 
-    sText = '';
+    _str sText = '';
     if (k_line_comment())
         sText = sLeft;
@@ -441 +460 @@
 {
     boolean fFix = false;               /* cursor at function fix. (last function) */
-    cur_line = p_line;
-    prev_line = -1;
-    next_line = -1;
+    int cur_line = p_line;
+    int prev_line = -1;
+    int next_line = -1;
+    typeless org_pos;
     _save_pos2(org_pos);
 
@@ -505 +525 @@
      * Check if this is a real function implementation.
      */
+    typeless procpos;
     _save_pos2(procpos);
-    if (!k_func_goto_nearest_functions())
-    {
-        proc_line = p_line;
+    if (!k_func_goto_nearest_function())
+    {
+        int proc_line = p_line;
 
         if (!k_func_searchcode("{"))
@@ -532 +553 @@
 static _str k_func_getfunction_name()
 {
-    sFunctionName = current_proc();
+    _str sFunctionName = current_proc();
     if (!sFunctionName)
         sFunctionName = "";
@@ -546 +567 @@
 static _str k_func_getparams()
 {
+    typeless org_pos;
     _save_pos2(org_pos);
+
+    /*
+     * Try use the tags first.
+     */
+    _UpdateContext(true);
+    int context_id = tag_current_context();
+    if (context_id <= 0)
+    {
+        k_func_goto_nearest_function();
+        context_id = tag_current_context();
+    }
+    if (context_id > 0)
+    {
+        _str args = '';
+        _str type = '';
+       tag_get_detail2(VS_TAGDETAIL_context_args, context_id, args);
+       tag_get_detail2(VS_TAGDETAIL_context_type, context_id, type);
+       if (tag_tree_type_is_func(type))
+           return args
+           //caption = tag_tree_make_caption_fast(VS_TAGMATCH_context,context_id,true,true,false);
+    }
 
     /*
@@ -558 +601 @@
          * Get parameters.
          */
+        typeless posStart;
         _save_pos2(posStart);
-        offStart = _QROffset();
+        long offStart = _QROffset();
         if (!find_matching_paren())
         {
-            offEnd = _QROffset();
+            long offEnd = _QROffset();
             _restore_pos2(posStart);
             p_col++;
-            _str sParamsRaw = strip(get_text(offEnd - offStart - 1));
+            _str sParamsRaw = strip(get_text((int)(offEnd - offStart - 1)));
 
 
@@ -574 +618 @@
 
             int i;
+            _str chPrev;
             for (i = 1, chPrev = ' '; i <= length(sParamsRaw); i++)
             {
-                ch = substr(sParamsRaw, i, 1);
+                _str ch = substr(sParamsRaw, i, 1);
 
                 /*
@@ -673 +718 @@
     if (iParam == iCurParam)
     {   /* (yeah, we did!) */
-        sArg = strip(substr(sParams, iStartParam, i - iStartParam));
+        _str sArg = strip(substr(sParams, iStartParam, i - iStartParam));
         /* remove M$ stuff */
         sArg = stranslate(sArg, "", "IN", "E");
@@ -719 +764 @@
     int     iParLevel;
     int     iCurParam;
-
-    sType = sName = sDefault = "";
+    _str    sType = "", sName = "", sDefault = "";
 
     /* check for 0 parameters */
@@ -749 +793 @@
 static _str k_func_getreturntype(boolean fPureType = false)
 {
+    typeless org_pos;
     _save_pos2(org_pos);
 
@@ -759 +804 @@
          * Return type is from function start to function name...
          */
+        typeless posStart;
         _save_pos2(posStart);
-        offStart = _QROffset();
+        long offStart = _QROffset();
 
         if (!k_func_searchcode("("))               /* makes some assumptions. */
         {
             prev_word();
-            offEnd = _QROffset();
+            long offEnd = _QROffset();
             _restore_pos2(posStart);
-            _str sTypeRaw = strip(get_text(offEnd - offStart));
+            _str sTypeRaw = strip(get_text((int)(offEnd - offStart)));
 
             //say 'sTypeRaw='sTypeRaw;
@@ -838 +884 @@
 
             int i;
+            _str chPrev;
             for (i = 1, chPrev = ' '; i <= length(sTypeRaw); i++)
             {
-                ch = substr(sTypeRaw, i, 1);
+                _str ch = substr(sTypeRaw, i, 1);
 
                 /*
@@ -912 +959 @@
 static boolean k_func_in_code()
 {
+    typeless searchsave;
     _save_pos2(searchsave);
     boolean fRc = !_in_comment();
@@ -924 +972 @@
 static _str k_func_get_next_code_text()
 {
-    _str ch;
+    typeless searchsave;
     _save_pos2(searchsave);
-    ch = k_func_get_next_code_text2();
+    _str ch = k_func_get_next_code_text2();
     _restore_pos2(searchsave);
     return ch;
@@ -939 +987 @@
     boolean fRc;
     int     curline = p_line;
-
+    typeless searchsave;
     _save_pos2(searchsave);
     k_func_get_next_code_text2();
@@ -958 +1006 @@
     do
     {
-        curcol = ++p_col;
-        end_line()
+        int curcol = ++p_col;
+        end_line();
         if (p_col <= curcol)
         {
@@ -993 +1041 @@
 static void k_javadoc_box_start(_str sStr = '', boolean fDouble = true)
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -1000 +1050 @@
            _insert_text(" ");
 
-    sText = sLeft;
+    _str sText = sLeft;
     if (fDouble)
         sText = sLeft:+substr(sLeft, length(sLeft), 1);
@@ -1013 +1063 @@
 static void k_javadoc_box_line(_str sStr = '', int iPadd = 0, _str sStr2 = '', int iPadd2 = 0, _str sStr3 = '')
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -1019 +1071 @@
            _insert_text(" ");
 
+    _str sText;
     if (k_line_comment())
         sText = sLeft;
@@ -1031 +1084 @@
     if (iPadd > 0)
     {
+        int i;
         for (i = length(sText); i < iPadd; i++)
             sText = sText:+' ';
@@ -1054 +1108 @@
 static void k_javadoc_box_end()
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (!k_commentconfig(sLeft, sRight, iColumn))
         return;
@@ -1060 +1116 @@
            _insert_text(" ");
 
+    _str sText;
     if (k_line_comment())
         sText = sLeft;
@@ -1133 +1190 @@
          */
         int     iPadd2 = 0;
+        int     i;
         for (i = 0; i < cArgs; i++)
         {
@@ -1150 +1208 @@
             if (!k_func_enumparams(sArgs, i, sType, sName, sDefault))
             {
-                sStr3 = '';
+                _str sStr3 = '';
                 if (sDefault != "")
                     sStr3 = '(default='sDefault')';
@@ -1169 +1227 @@
         k_javadoc_box_line('@time', iPadd);
         k_javadoc_box_line('@sketch', iPadd);
-    }
-    k_javadoc_box_line('@status', iPadd);
-    k_javadoc_box_line('@author', iPadd, skUserName ' <' skUserEmail '>');
-    if (fkStyleFullHeaders)
+        k_javadoc_box_line('@status', iPadd);
+        k_javadoc_box_line('@author', iPadd, skUserName ' <' skUserEmail '>');
         k_javadoc_box_line('@remark', iPadd);
+    }
     k_javadoc_box_end();
 
@@ -1222 +1279 @@
 
         case 'GPL':
-            sProg = skProgram;
-            k_javadoc_box_line()
+            _str sProg = skProgram;
+            k_javadoc_box_line();
             if (sProg == '')
                 sProg = 'This program';
@@ -1235 +1292 @@
             k_javadoc_box_line('the Free Software Foundation; either version 2 of the License, or');
             k_javadoc_box_line('(at your option) any later version.');
-            k_javadoc_box_line()
+            k_javadoc_box_line();
             k_javadoc_box_line(sProg ' is distributed in the hope that it will be useful,');
             k_javadoc_box_line('but WITHOUT ANY WARRANTY; without even the implied warranty of');
             k_javadoc_box_line('MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the');
             k_javadoc_box_line('GNU General Public License for more details.');
-            k_javadoc_box_line()
+            k_javadoc_box_line();
             k_javadoc_box_line('You should have received a copy of the GNU General Public License');
             k_javadoc_box_line('along with ' sProg '; if not, write to the Free Software');
@@ -1248 +1305 @@
         case 'LGPL':
             sProg = skProgram;
-            k_javadoc_box_line()
+            k_javadoc_box_line();
             if (sProg == '')
                 sProg = 'This program';
@@ -1260 +1317 @@
             k_javadoc_box_line('by the Free Software Foundation; either version 2 of the License, or');
             k_javadoc_box_line('(at your option) any later version.');
-            k_javadoc_box_line()
+            k_javadoc_box_line();
             k_javadoc_box_line(sProg ' is distributed in the hope that it will be useful,');
             k_javadoc_box_line('but WITHOUT ANY WARRANTY; without even the implied warranty of');
             k_javadoc_box_line('MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the');
             k_javadoc_box_line('GNU Lesser General Public License for more details.');
-            k_javadoc_box_line()
+            k_javadoc_box_line();
             k_javadoc_box_line('You should have received a copy of the GNU Lesser General Public License');
             k_javadoc_box_line('along with ' sProg '; if not, write to the Free Software');
@@ -1348 +1405 @@
 void k_oneliner()
 {
+    _str sLeft, sRight;
+    int iColumn;
     if (    k_commentconfig(sLeft, sRight, iColumn)
         &&  iColumn > 0)
@@ -1366 +1425 @@
 {
     /* not supported for column based sources */
+    _str sLeft, sRight;
+    int iColumn;
     if (    !k_commentconfig(sLeft, sRight, iColumn)
         ||  iColumn > 0)
         return;
-
+    _str sStr;
     if (skChange != '')
         sStr = skChange ' (' skUserInitials ')';
@@ -1386 +1447 @@
 {
     /* kso I5-10000 2002-09-10: */
+    _str sSig;
     if (skChange != '')
         sSig = skUserInitials ' ' skChange ' ' k_date() ': ';
@@ -1402 +1464 @@
 void klib_klogentry()
 {
+    typeless org_pos;
     _save_pos2(org_pos);
 
@@ -1425 +1488 @@
             {
                 p_col++;
-                cArgs = k_func_countparams(sParams);
+                int cArgs = k_func_countparams(sParams);
                 if (cArgs > 0)
                 {
-                    sArgs = "";
+                    _str sArgs = "";
+                    int i;
                     for (i = 0; i < cArgs; i++)
                     {
-                        _str sType, sName, sDefault
+                        _str sType, sName, sDefault;
                         if (!k_func_enumparams(sParams, i, sType, sName, sDefault))
                             sArgs = sArgs', 'sName;
@@ -1447 +1511 @@
                 if (def_next_word_style == 'E')
                     prev_word();
+                int iIgnorePos = 0;
                 if (substr(cur_word(iIgnorePos), 1, 9) == "KLOGENTRY")
                     delete_line();
@@ -1468 +1533 @@
 void klib_klogexit()
 {
+    typeless org_pos;
     _save_pos2(org_pos);
 
@@ -1487 +1553 @@
              * Insert text.
              */
-            cur_col = p_col;
+            int cur_col = p_col;
             if (sType == 'void' || sType == 'VOID')
             {   /* procedure */
+                int iIgnorePos;
                 fReturn = cur_word(iIgnorePos) == 'return';
                 if (!fReturn)
@@ -1501 +1568 @@
                 if (fReturn)
                 {
+                    int i;
                     for (i = 1; i < cur_col; i++)
                         _insert_text(" ");
@@ -1509 +1577 @@
             {   /* function */
                 _insert_text("KLOGEXIT();\n");
+                int i;
                 for (i = 1; i < cur_col; i++)
                     _insert_text(" ");
@@ -1516 +1585 @@
                  * Insert value if possible.
                  */
+                typeless valuepos;
                 _save_pos2(valuepos);
                 next_word();
                 if (def_next_word_style == 'E')
                     prev_word();
+                int iIgnorePos;
                 if (cur_word(iIgnorePos) == 'return')
                 {
                     p_col += length('return');
+                    typeless posStart;
                     _save_pos2(posStart);
-                    offStart = _QROffset();
+                    long offStart = _QROffset();
                     if (!k_func_searchcode(";", "E+"))
                     {
-                        offEnd = _QROffset();
+                        long offEnd = _QROffset();
                         _restore_pos2(posStart);
-                        _str sValue = strip(get_text(offEnd - offStart));
+                        _str sValue = strip(get_text((int)(offEnd - offStart)));
                         //say 'sValue = 'sValue;
                         _restore_pos2(valuepos);
@@ -1542 +1614 @@
              * Remove old KLOGEXIT statement on previous line if any.
              */
+            typeless valuepos;
             _save_pos2(valuepos);
-            newexitline = p_line;
+            int newexitline = p_line;
             p_line--; p_col = 1;
             next_word();
             if (def_next_word_style == 'E')
                 prev_word();
+            int iIgnorePos;
             if (p_line == newexitline - 1 && substr(cur_word(iIgnorePos), 1, 8) == 'KLOGEXIT')
                 delete_line();
@@ -1574 +1648 @@
                     else
                     {
+                        typeless returnget;
                         _save_pos2(returnget);
                         k_func_searchcode("return", "E-");
-                        return_col = p_col;
+                        int return_col = p_col;
                         _restore_pos2(returnget);
 
@@ -1590 +1665 @@
                     prev_word();
                     p_col -= p_SyntaxIndent;
-                    codecol = p_col;
+                    int codecol = p_col;
                     _insert_text("{\n");
                     while (p_col < codecol)
@@ -1613 +1688 @@
 void klib_klog_file_ask()
 {
-    klib_klog_file_int(true)
+    klib_klog_file_int(true);
 }
 
@@ -1622 +1697 @@
 void klib_klog_file_no_ask()
 {
-    klib_klog_file_int(false)
+    klib_klog_file_int(false);
 }
 
@@ -1658 +1733 @@
         center_line();
         _refresh_scroll();
-        sFunction = k_func_getfunction_name();
+        _str sFunction = k_func_getfunction_name();
         rc = fAsk ? _message_box("Process this function ("sFunction")?", "Visual SlickEdit", MB_YESNOCANCEL | MB_ICONQUESTION) : IDYES;
         if (rc == IDYES)
         {
+            typeless procpos;
             _save_pos2(procpos);
             klib_klogentry();
@@ -1679 +1755 @@
     while (!prev_proc() && !fUserCancel)
     {
+        typeless procpos;
         _save_pos2(procpos);
-        sCurFunction = k_func_getfunction_name();
+        _str sCurFunction = k_func_getfunction_name();
         //say 'exit main loop: ' sCurFunction
 
@@ -1701 +1778 @@
             center_line();
             _refresh_scroll();
-            sFunction = k_func_getfunction_name();
+            _str sFunction = k_func_getfunction_name();
             rc =  fAsk ? _message_box("Process this exit from "sFunction"?", "Visual SlickEdit", MB_YESNOCANCEL | MB_ICONQUESTION) : IDYES;
             deselect();
             if (rc == IDYES)
             {
+                typeless returnpos;
                 _save_pos2(returnpos);
                 klib_klogexit();
@@ -1724 +1802 @@
         _restore_pos2(procpos);
         _save_pos2(procpos);
-        sType = k_func_getreturntype(true);
+        _str sType = k_func_getreturntype(true);
         if (!fUserCancel && sType && (sType == 'void' || sType == 'VOID'))
         {
@@ -1730 +1808 @@
                 &&  !find_matching_paren())
             {
+                typeless funcend;
                 _save_pos2(funcend);
                 prev_word();
+                int iIgnorePos;
                 if (cur_word(iIgnorePos) != "return")
                 {
@@ -1740 +1820 @@
                     center_line();
                     _refresh_scroll();
-                    sFunction = k_func_getfunction_name();
+                    _str sFunction = k_func_getfunction_name();
                     rc = fAsk ? _message_box("Process this exit from "sFunction"?", "Visual SlickEdit", MB_YESNOCANCEL | MB_ICONQUESTION) : IDYES;
                     deselect();
                     if (rc == IDYES)
                     {
+                        typeless returnpos;
                         _save_pos2(returnpos);
                         klib_klogexit();
@@ -1772 +1853 @@
         /*
         RetagFilesInTagFile2(project_tag_file, orig_view_id, temp_view_id, rebuild_all, false,
-                             doRemove,false,true,true);*/7
+                             doRemove,false,true,true);*/
     }
     else
@@ -1989 +2070 @@
      * Find user format ini file.
      */
-    userini = maybe_quote_filename(_config_path():+'uformat.ini');
+    _str userini = maybe_quote_filename(_config_path():+'uformat.ini');
     if (file_match('-p 'userini, 1) == '')
     {
-        ini = maybe_quote_filename(slick_path_search('uformat.ini'));
+        _str ini = maybe_quote_filename(slick_path_search('uformat.ini'));
         if (ini != '') userini = ini;
     }
@@ -2000 +2081 @@
      * Remove any old schemes.
      */
+    int i,j,tv;
     for (i = 0; i < StyleSchemes._length(); i++)
         for (j = 0; j < StyleLanguages._length(); j++)
         {
-            sectionname = StyleLanguages[j]:+'-scheme-':+StyleSchemes[i].name;
+            _str sectionname = StyleLanguages[j]:+'-scheme-':+StyleSchemes[i].name;
             if (!_ini_get_section(userini, sectionname, tv))
             {
@@ -2019 +2101 @@
         for (j = 0; j < StyleLanguages._length(); j++)
         {
-            sectionname = StyleLanguages[j]:+'-scheme-':+StyleSchemes[i].name;
-            orig_view_id = _create_temp_view(temp_view_id);
+            _str sectionname = StyleLanguages[j]:+'-scheme-':+StyleSchemes[i].name;
+            int temp_view_id, k;
+            _str orig_view_id = _create_temp_view(temp_view_id);
             activate_view(temp_view_id);
             for (k = 0; k < StyleSchemes[i].settings._length(); k++)
@@ -2028 +2111 @@
             _ini_replace_section(userini, sectionname, temp_view_id);
             //message(userini)
-            activate_view(orig_view_id);
+            //bogus id - activate_view(orig_view_id);
         }
     }
@@ -2045 +2128 @@
      * Find user format ini file.
      */
-    userini = maybe_quote_filename(_config_path():+'uformat.ini');
+    _str userini = maybe_quote_filename(_config_path():+'uformat.ini');
     if (file_match('-p 'userini, 1) == '')
     {
-        ini = maybe_quote_filename(slick_path_search('uformat.ini'));
+        _str ini = maybe_quote_filename(slick_path_search('uformat.ini'));
         if (ini != '') userini = ini;
     }
@@ -2055 +2138 @@
      * Set the scheme for each language.
      */
+    int j;
     for (j = 0; j < StyleLanguages._length(); j++)
     {
@@ -2114 +2198 @@
 {
     if (iBraceStyle < 1 || iBraceStyle > 3)
-        {
-        say 'k_styles_setindent: iBraceStyle is bad (='iBraceStyle')';
+    {
+        message('k_styles_setindent: iBraceStyle is bad (=' :+ iBraceStyle :+ ')');
         iBraceStyle = 2;
-        }
+    }
+
     /*
      * def-options for extentions known to have that info.
      */
+    int i;
     for (i = 0; i < defoptions._length(); i++)
     {
-        idx = find_index(defoptions[i], MISC_TYPE);
+        int idx = find_index(defoptions[i], MISC_TYPE);
         if (!idx)
             continue;