ges_4350_incremental_changes_20220524a_to_20220525a.patch
| two/src/com/goldencode/p2j/uast/progress.g 2022-05-25 12:47:24.000000000 -0400 | ||
|---|---|---|
| 15254 | 15254 |
( |
| 15255 | 15255 |
options { generateAmbigWarnings = false; }
|
| 15256 | 15256 |
: |
| 15257 |
// TODO: should this use of aggregate_phrase just be moved into format_phrase? |
|
| 15257 | 15258 |
lparens aggregate_phrase rparens |
| 15258 | 15259 |
| { numFP < 2 }?
|
| 15259 | 15260 |
format_phrase[symbolName, fld, true, false] { numFP++; }
|
| ... | ... | |
| 20311 | 20312 |
( |
| 20312 | 20313 |
options { generateAmbigWarnings = false; }
|
| 20313 | 20314 |
: |
| 20315 |
// TODO: should this use of aggregate_phrase just be moved into format_phrase? |
|
| 20314 | 20316 |
lparens ag:aggregate_phrase! { hide(#ag); } rparens
|
| 20315 | 20317 |
| { numFP < 2 }?
|
| 20316 | 20318 |
format_phrase[null, null, false, false]! { numFP++; }
|
| ... | ... | |
| 20894 | 20896 |
*/ |
| 20895 | 20897 |
trigger_phrase |
| 20896 | 20898 |
: |
| 20899 |
// TODO: can the END be optional here (as it is everywhere else at EOF)? |
|
| 20897 | 20900 |
KW_TRIGGERS^ block_term (simple_on_stmt)* end_stmt[false] |
| 20898 | 20901 |
; |
| 20899 | 20902 |
|
| ... | ... | |
| 24795 | 24798 |
} |
| 24796 | 24799 |
#cat.addChild(#b); |
| 24797 | 24800 |
} |
| 24801 |
// TODO: can the END be optional here (as it is everywhere else at EOF)? |
|
| 24798 | 24802 |
end_stmt[true] |
| 24799 | 24803 |
) |
| 24800 | 24804 |
; |
| ... | ... | |
| 24809 | 24813 |
finally_stmt |
| 24810 | 24814 |
: |
| 24811 | 24815 |
( |
| 24816 |
// TODO: can the END be optional here (as it is everywhere else at EOF)? |
|
| 24812 | 24817 |
KW_FINALLY^ block_term block end_stmt[true] |
| 24813 | 24818 |
) |
| 24814 | 24819 |
; |
| ... | ... | |
| 27991 | 27996 |
( |
| 27992 | 27997 |
options { generateAmbigWarnings = false; }
|
| 27993 | 27998 |
: |
| 27999 |
// TODO: should this use of aggregate_phrase just be moved into format_phrase? |
|
| 27994 | 28000 |
lparens aggregate_phrase rparens |
| 27995 | 28001 |
|
| 27996 | 28002 |
| { numFP < 2 }?
|
| two/src/com/goldencode/p2j/uast/SymbolResolver.java 2022-05-24 18:16:56.000000000 -0400 | ||
|---|---|---|
| 4527 | 4527 |
// we cannot just process the genesis object that started the graph; we must process all |
| 4528 | 4528 |
// referenced classes/interfaces including those not in our parent hierarchy AND we need |
| 4529 | 4529 |
// to process them in the same order they were processed previously |
| 4530 |
if (!wa.processed.isEmpty())
|
|
| 4530 |
while (!wa.processed.isEmpty())
|
|
| 4531 | 4531 |
{
|
| 4532 |
for (String fname : wa.processed) |
|
| 4533 |
{
|
|
| 4534 |
// ensure all super-classes are loaded for this object |
|
| 4535 |
parseHierarchy(fname, wa); |
|
| 4536 |
} |
|
| 4532 |
String fname = wa.processed.remove(); |
|
| 4537 | 4533 |
|
| 4538 |
wa.processed.clear(); |
|
| 4534 |
// ensure all super-classes are loaded for this object |
|
| 4535 |
parseHierarchy(fname, wa); |
|
| 4539 | 4536 |
} |
| 4540 | 4537 |
|
| 4541 | 4538 |
// do NOT handle the 2nd level parsing of the genesis object here if that parsing is already |
| ... | ... | |
| 9887 | 9884 |
private Set<String> preScanRefs = new HashSet<>(); |
| 9888 | 9885 |
|
| 9889 | 9886 |
/** An ordered set of class/interface references processed. */ |
| 9890 |
private Set<String> processed = new LinkedHashSet<>();
|
|
| 9887 |
private LinkedList<String> processed = new LinkedList<>();
|
|
| 9891 | 9888 |
|
| 9892 | 9889 |
/** The converter to generated Java names. */ |
| 9893 | 9890 |
private NameConverter nconvert = new NameConverter(); |