aboutsummaryrefslogtreecommitdiff
path: root/project/src/lib-analyze.c
diff options
context:
space:
mode:
authorWiimm <wiimm@wiimm.de>2024-03-26 10:35:38 +0100
committerWiimm <wiimm@wiimm.de>2024-03-26 10:35:38 +0100
commit246fdb38d7c2fb3054b8f8528e11dc8f17691750 (patch)
treec106adbb6c640ab93c4b3f19864fde6046b1a759 /project/src/lib-analyze.c
parentb8aca433e32346c9293acc34a9e2242809ac5692 (diff)
SZS 2.42a
Diffstat (limited to '')
-rw-r--r--project/src/lib-analyze.c47
1 files changed, 30 insertions, 17 deletions
diff --git a/project/src/lib-analyze.c b/project/src/lib-analyze.c
index de87cca..ffb48b7 100644
--- a/project/src/lib-analyze.c
+++ b/project/src/lib-analyze.c
@@ -192,6 +192,18 @@ void AnalyzeSZS
FindSpecialFilesSZS(szs,false);
+ //--- scan slots
+
+ AnalyzeSlot(&as->slotana,szs);
+ if (fname)
+ AnalyzeSlotByName(&as->slotinfo,true,MemByString(fname));
+ if (as->slotana.mandatory_slot[0])
+ AnalyzeSlotAttrib(&as->slotinfo,false,MemByString(as->slotana.mandatory_slot));
+ FinalizeSlotInfo(&as->slotinfo,true);
+ if (*as->slotinfo.slot_attrib)
+ ct_dest = StringCat2E(ct_dest,ct_end,",",as->slotinfo.slot_attrib);
+
+
//--- scan LEX
InitializeLexInfo(&as->lexinfo);
@@ -202,26 +214,22 @@ void AnalyzeSZS
InitializeLEX(&lex);
lex.check_only = true;
ScanLEX(&lex,false,szs->course_lex_data,szs->course_lex_size);
- szs->have.lex_sect = lex.have_sect;
- szs->have.lex_feat = lex.have_feat;
- szs->have.lex_apply_otl = lex.apply_otl;
- SetupLexInfo(&as->lexinfo,&lex);
+ if (lex.have_sect)
+ {
+ szs->have.lex_sect = lex.have_sect;
+ szs->have.lex_feat = lex.have_feat;
+ szs->have.lex_apply_otl = lex.apply_otl;
+ SetupLexInfo(&as->lexinfo,&lex);
+ }
+ if (!lex.have_sect)
+ {
+ szs->course_lex_data = 0;
+ szs->course_lex_size = 0;
+ }
ResetLEX(&lex);
}
- //--- scan slots
-
- AnalyzeSlot(&as->slotana,szs);
- if (fname)
- AnalyzeSlotByName(&as->slotinfo,true,MemByString(fname));
- if (as->slotana.mandatory_slot[0])
- AnalyzeSlotAttrib(&as->slotinfo,false,MemByString(as->slotana.mandatory_slot));
- FinalizeSlotInfo(&as->slotinfo,true);
- if (*as->slotinfo.slot_attrib)
- ct_dest = StringCat2E(ct_dest,ct_end,",",as->slotinfo.slot_attrib);
-
-
//--- scan KMP
bool valid_track = true; // use temp var because of early 'return'
@@ -390,11 +398,16 @@ void AnalyzeSZS
ct_dest = StringCopyE(ct_dest,ct_end,",aiparam");
}
- if ( szs->have.szs[HAVESZS_LICENSE] > HFM_NONE )
+ if ( szs->have.szs[HAVESZS_LICENSE_TXT] > HFM_NONE )
{
ct_dest = StringCopyE(ct_dest,ct_end,",license");
}
+ if ( szs->have.szs[HAVESZS_VERSION_BIN] > HFM_NONE )
+ {
+ ct_dest = StringCopyE(ct_dest,ct_end,",vers_bin");
+ }
+
//--- scan KCL