Project

General

Profile

progress_g&SymbolResolver_java.diff

Ovidiu Maxiniuc, 03/22/2019 03:27 PM

Download (13.1 KB)

View differences:

/home/om/repositories/local/p2j/active/3750b/src/com/goldencode/p2j/uast/SymbolResolver.java
362 362
**                           table.
363 363
**                           Annotate the USING class reference with the class info (and prescan 
364 364
**                           if needed).
365
**     GES 20181216          Added method_def tempIdx support.   
365
**     GES 20181216          Added method_def tempIdx support.
366 366
** 080 CA  20190219          tempIdx support is added to constructors, too - so that NEW can 
367 367
**                           reference the exact definition via the refid annotation.
368
**     OM  20190322          Fixed relative path of mapped classes.
368 369
*/
369 370

  
370 371
/*
......
1467 1468
         // remove the leading "/" or "\" char
1468 1469
         begin = 2;
1469 1470
      }
1471
      if (!path.endsWith("\\") && !path.endsWith("/"))
1472
      {
1473
         begin++;
1474
      }
1470 1475
      
1471 1476
      for (int i = 0; i < list.length; i++)
1472 1477
      {
......
7255 7260
            result.dotnet  = dotnet[i];
7256 7261
            return true;
7257 7262
         }
7258
      }                                          
7263
      }
7259 7264
      
7260 7265
      return false;
7261 7266
   }
7262
-- /tmp/qbzr/bzr-diff-T_bEok/1/src/com/goldencode/p2j/uast/progress.g
7267
++ /home/om/repositories/local/p2j/active/3750b/src/com/goldencode/p2j/uast/progress.g
......
1946 1946
** 361 OM  20190111          Added support for CATEGORY table option. A few typos fixed.
1947 1947
** 362 HC  20190313          Initial implementation of TREELIST widget. TREEVIEW widget
1948 1948
**                           refactored to make it the base for the TREELIST widget.
1949
** 36_ OM  20190322          Added KW_CUR_QRY, KW_MAX_LVL, KW_REST_ROW. Fixed KW_PAR_FLDA and 
1950
**                           KW_PAR_FLDB.
1949 1951
*/
1950 1952

  
1951 1953
/*
......
4767 4769
      KW_YES_NO_C;
4768 4770
      KW_Y;
4769 4771
      KW_Y_OF;
4772
      KW_CUR_QRY;    // Data-relation object handle mehods and attributes
4773
      KW_MAX_LVL;
4774
      KW_REST_ROW;
4770 4775
      BEGIN_FWD_EXTENSION;
4771 4776
         KW_TIMER;
4772 4777
         KW_CALLBACK;
......
7796 7801
      attrsAndMethods.put( KW_CUR_RSI , ATTR_CLASS   );
7797 7802
      attrsAndMethods.put( KW_CUR_R_M , ATTR_LOGICAL );
7798 7803
      attrsAndMethods.put( KW_CUR_WIN , ATTR_HANDLE  );
7804
      attrsAndMethods.put( KW_CUR_QRY , METH_HANDLE  );
7799 7805
      attrsAndMethods.put( KW_CURR_TAB, ATTR_INT     ); // FWD extension, not real 4GL
7800 7806
      attrsAndMethods.put( KW_CVT_2OFF, METH_INT     );
7801 7807
      attrsAndMethods.put( KW_ADD_TAB , METH_VOID    ); // FWD extension, not real 4GL
......
7967 7973
      attrsAndMethods.put( KW_FOCUS_RS, ATTR_LOGICAL );
7968 7974
      attrsAndMethods.put( KW_FONT    , ATTR_INT     );
7969 7975
      attrsAndMethods.put( KW_FORE    , ATTR_LOGICAL );
7976
      attrsAndMethods.put( KW_F_KEY_H , ATTR_LOGICAL );
7970 7977
      attrsAndMethods.put( KW_FORM_INP, ATTR_CHAR    );
7971 7978
      attrsAndMethods.put( KW_FORM_LIN, ATTR_MEMPTR  );
7972 7979
      attrsAndMethods.put( KW_FORMAT  , ATTR_CHAR    );
......
8236 8243
      attrsAndMethods.put( KW_MAX_HT  , ATTR_DEC     );
8237 8244
      attrsAndMethods.put( KW_MAX_H_C , ATTR_DEC     );
8238 8245
      attrsAndMethods.put( KW_MAX_H_P , ATTR_INT     );
8246
      attrsAndMethods.put( KW_MAX_LVL , ATTR_INT     );
8239 8247
      attrsAndMethods.put( KW_MAX_VAL , ATTR_INT     );
8240 8248
      attrsAndMethods.put( KW_MAX_WID , ATTR_DEC     );
8241 8249
      attrsAndMethods.put( KW_MAX_W_C , ATTR_DEC     );
......
8354 8362
      attrsAndMethods.put( KW_PARENT  , ATTR_HANDLE  );
8355 8363
      attrsAndMethods.put( KW_PARM    , ATTR_CHAR    );
8356 8364
      attrsAndMethods.put( KW_PARSE_ST, ATTR_INT     );
8365
      attrsAndMethods.put( KW_PAR_FLDA, ATTR_CHAR    );
8366
      attrsAndMethods.put( KW_PAR_FLDB, ATTR_CHAR    );
8357 8367
      attrsAndMethods.put( KW_PASSWD_F, ATTR_LOGICAL );
8358 8368
      attrsAndMethods.put( KW_PATHNAME, ATTR_CHAR    );
8359 8369
      attrsAndMethods.put( KW_PBE_H_AL, ATTR_CHAR    );
......
8440 8450
      attrsAndMethods.put( KW_RESIZABL, ATTR_LOGICAL );
8441 8451
      attrsAndMethods.put( KW_RESORT  , METH_VOID    ); // FWD extension, not real 4GL
8442 8452
      attrsAndMethods.put( KW_REST_RID, ATTR_ROWID   );
8453
      attrsAndMethods.put( KW_REST_ROW, ATTR_INT     );
8443 8454
      attrsAndMethods.put( KW_RET_INS , ATTR_LOGICAL );
8444 8455
      attrsAndMethods.put( KW_RET_SHAP, ATTR_LOGICAL );
8445 8456
      attrsAndMethods.put( KW_RET_VAL , ATTR_POLY    );
......
31960 31971
         new Keyword("after-fill"                     ,  0, KW_AFT_FILL, false),  // missing from keyword index and UNTESTED at this time
31961 31972
         new Keyword("after-row-fill"                 ,  0, KW_AFT_R_F , false),  // missing from keyword index and UNTESTED at this time
31962 31973
         new Keyword("after-rowid"                    ,  0, KW_AFT_ROID, false),  // missing from keyword index and UNTESTED at this time
31963
         new Keyword("after-table"                    ,  0, KW_AFT_TBL , false),  // missing from keyword index and UNTESTED at this time
31974
         new Keyword("after-table"                    ,  0, KW_AFT_TBL , false),
31964 31975
         new Keyword("alert-box"                      ,  0, KW_ALERT_BX, false),
31965 31976
         new Keyword("alias"                          ,  0, KW_ALIAS   , true ),
31966 31977
         new Keyword("all"                            ,  0, KW_ALL     , true ),
......
32046 32057
         new Keyword("before-hide"                    ,  8, KW_B4_HIDE , true ),
32047 32058
         new Keyword("before-row-fill"                ,  0, KW_B4_R_F  , false),  // missing from keyword index and UNTESTED at this time
32048 32059
         new Keyword("before-rowid"                   ,  0, KW_B4_ROWID, false),  // missing from keyword index and UNTESTED at this time
32049
         new Keyword("before-table"                   ,  0, KW_B4_TABLE, false),  // missing from keyword index and UNTESTED at this time
32060
         new Keyword("before-table"                   ,  0, KW_B4_TABLE, false),
32050 32061
         new Keyword("begin-event-group"              ,  0, KW_BEG_EV_G, false),
32051 32062
         new Keyword("begins"                         ,  0, KW_BEGINS  , true ),
32052 32063
         new Keyword("bell"                           ,  0, KW_BELL    , true ),
......
32148 32159
         new Keyword("child-buffer"                   ,  0, KW_CHLD_BUF, false),  // missing from keyword index and UNTESTED at this time
32149 32160
         new Keyword("clear-tabs"                     ,  0, KW_CLR_TABS, false),  // FWD extension, not a real 4GL keyword
32150 32161
         new Keyword("current-tab"                    ,  0, KW_CURR_TAB, false),  // FWD extension, not a real 4GL keyword
32151
         new Keyword("node-collapsed"                 ,  0, KW_N_COLED , false),  // FWD extension, not a real 4GL keyword
32152
         new Keyword("node-collapsing"                ,  0, KW_N_COLING, false),  // FWD extension, not a real 4GL keyword
32153
         new Keyword("node-expanded"                  ,  0, KW_N_EXPED , false),  // FWD extension, not a real 4GL keyword
32154
         new Keyword("node-expanding"                 ,  0, KW_N_EXPING, false),  // FWD extension, not a real 4GL keyword
32155
         new Keyword("nodes"                          ,  0, KW_NODES   , false),  // FWD extension, not a real 4GL keyword
32156 32162
         new Keyword("choices"                        ,  0, KW_CHOICES , false),  // missing in keyword index, found in prog handbook as a key function
32157 32163
         new Keyword("choose"                         ,  0, KW_CHOOSE  , false),
32158 32164
         new Keyword("chr"                            ,  0, KW_CHR     , true ),
......
32286 32292
         new Keyword("current-row-modified"           ,  0, KW_CUR_R_M , false),
32287 32293
         new Keyword("current-window"                 ,  0, KW_CUR_WIN , true ),
32288 32294
         new Keyword("current-value"                  ,  0, KW_CUR_VAL , false),
32295
         new Keyword("current-query"                  ,  0, KW_CUR_QRY,  false),
32289 32296
         new Keyword("current_date"                   ,  0, KW_CUR_DATE, false),  // possible SQL keyword in the keyword index but no reference found in the SQL 89 reference
32290 32297
         new Keyword("cursor"                         ,  4, KW_CURSOR  , true ),
32291 32298
         new Keyword("cursor-char"                    ,  0, KW_CUR_CHAR, false),
......
32601 32608
         new Keyword("for"                            ,  0, KW_FOR     , true ),
32602 32609
         new Keyword("force-file"                     ,  0, KW_FORCE_F , false),
32603 32610
         new Keyword("foreground"                     ,  4, KW_FORE    , false),
32604
         new Keyword("foreign-key-hidden"             ,  0, KW_F_KEY_H , false),  // missing from keyword index, found elsewhere in lang ref, TESTED
32611
         new Keyword("foreign-key-hidden"             ,  0, KW_F_KEY_H , false),
32605 32612
         new Keyword("form-input"                     ,  0, KW_FORM_INP, false),
32606 32613
         new Keyword("form-long-input"                ,  0, KW_FORM_LIN, false),
32607 32614
         new Keyword("format"                         ,  4, KW_FORMAT  , true ),  // handles "separate keyword" form too
......
33049 33056
         new Keyword("max-height"                     ,  0, KW_MAX_HT  , false),
33050 33057
         new Keyword("max-height-chars"               , 12, KW_MAX_H_C , false),
33051 33058
         new Keyword("max-height-pixels"              , 12, KW_MAX_H_P , false),
33059
         new Keyword("maximum-level"                  ,  0, KW_MAX_LVL , false),
33052 33060
         new Keyword("max-width-chars"                ,  9, KW_MAX_W_C , false),
33053 33061
         new Keyword("max-width-pixels"               , 11, KW_MAX_W_P , false),
33054 33062
         new Keyword("max-rows"                       ,  0, KW_MAX_ROWS, false),
......
33205 33213
         new Keyword("no-validate"                    ,  6, KW_NO_VALID, true ),
33206 33214
         new Keyword("no-wait"                        ,  0, KW_NO_WAIT , true ),
33207 33215
         new Keyword("no-word-wrap"                   ,  0, KW_NO_WRAP , false),
33216
         new Keyword("node-collapsed"                 ,  0, KW_N_COLED , false),  // FWD extension, not a real 4GL keyword
33217
         new Keyword("node-collapsing"                ,  0, KW_N_COLING, false),  // FWD extension, not a real 4GL keyword
33218
         new Keyword("node-expanded"                  ,  0, KW_N_EXPED , false),  // FWD extension, not a real 4GL keyword
33219
         new Keyword("node-expanding"                 ,  0, KW_N_EXPING, false),  // FWD extension, not a real 4GL keyword
33208 33220
         new Keyword("node-count"                     ,  0, KW_NODE_CNT, false),  // FWD extension, not a real 4GL keyword
33209 33221
         new Keyword("node-expanded"                  ,  0, KW_NODE_EXP, false),  // FWD extension, not a real 4GL keyword
33210 33222
         new Keyword("node-height"                    ,  0, KW_N_HEIGHT, false),  // FWD extension, not a real 4GL keyword
......
33331 33343
         new Keyword("page-width"                     ,  8, KW_PAGE_WID, false),
33332 33344
         new Keyword("parameter"                      ,  5, KW_PARM    , true ),
33333 33345
         new Keyword("parent-buffer"                  ,  0, KW_PAR_BUFF, false),  // missing from keyword index and UNTESTED at this time
33334
         new Keyword("parent-fields-after"            ,  0, KW_PAR_FLDA, false),  // missing from keyword index and UNTESTED at this time
33335
         new Keyword("parent-fields-before"           ,  0, KW_PAR_FLDB, false),  // missing from keyword index and UNTESTED at this time
33346
         new Keyword("parent-fields-after"            ,  0, KW_PAR_FLDA, false),
33347
         new Keyword("parent-fields-before"           ,  0, KW_PAR_FLDB, false),
33336 33348
         new Keyword("parent-id-field"                ,  0, KW_PAR_IFLD, false),  // missing from keyword index and UNTESTED at this time
33337 33349
         new Keyword("parent-id-relation"             ,  0, KW_PAR_IREL, false),  // missing from keyword index and UNTESTED at this time
33338 33350
         new Keyword("parent-relation"                ,  0, KW_PAR_REL , false),  // missing from keyword index and UNTESTED at this time
......
33508 33520
         new Keyword("reset"                          ,  0, KW_RESET   , false),
33509 33521
         new Keyword("resize"                         ,  0, KW_RESIZE  , false),
33510 33522
         new Keyword("resizable"                      ,  6, KW_RESIZABL, false),
33523
         new Keyword("restart-row"                    ,  0, KW_REST_ROW, false),
33511 33524
         new Keyword("resort"                         ,  0, KW_RESORT  , false),  // FWD extension, not a real 4GL keyword
33512 33525
         new Keyword("restart-rowid"                  ,  0, KW_REST_RID, false),
33513 33526
         new Keyword("result"                         ,  0, KW_RESULT  , false),
......
33900 33913
         new Keyword("total"                          ,  0, KW_TOTAL   , false),
33901 33914
         new Keyword("to-rowid"                       ,  0, KW_TO_ROWID, true ),
33902 33915
         new Keyword("trace-filter"                   ,  0, KW_TRC_FILT, false),  // missing from keyword index, found in customer code and UNTESTED at this time
33903
         new Keyword("tracking-changes"               ,  0, KW_TRAC_CHG, false),  // missing from keyword index and UNTESTED at this time
33916
         new Keyword("tracking-changes"               ,  0, KW_TRAC_CHG, false),
33904 33917
         new Keyword("trailing"                       ,  0, KW_TRAILING, false),
33905 33918
         new Keyword("trans-init-procedure"           ,  0, KW_TRAN_I_P, false),
33906 33919
         new Keyword("trans"                          ,  0, KW_TRANS   , true ), // undocumented feature transa and transac are unreserved (just symbols) so we exclude them here by using 2 keyword defs to leave a loophole like in the 4GL