Fossil SCM

In stead of "A-card on tag" syntax error, report "T-card in attachment". Various other inconsitancies in syntax error messages. This is only refactoring, no change in functionality.

jan.nijtmans 2013-08-22 18:44 trunk
Commit bcaba112cb3ccaaa9fb95a1a48f6d44f4d419c51
Parent 960fb04e35a529e…
1 file changed +21 -21
~ src/manifest.c
M src/manifest.c
+21 -21
--- src/manifest.c
+++ src/manifest.c
@@ -876,68 +876,68 @@
876876
 SYNTAX("cluster contains a card other than M- or Z-");
877877
 }
878878
 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879879
 p->type = CFTYPE_CLUSTER;
880880
 }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
881
- if( p->rDate<=0.0 ) SYNTAX("missing date for check-in");
881
+ if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
882882
 if( p->nField>0 ) SYNTAX("J-card in check-in");
883883
 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
884884
 if( p->zWiki ) SYNTAX("W-card in check-in");
885885
 if( p->zWikiTitle ) SYNTAX("L-card in check-in");
886886
 if( p->zEventId ) SYNTAX("E-card in check-in");
887887
 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
888888
 if( p->zAttachName ) SYNTAX("A-card in check-in");
889889
 p->type = CFTYPE_MANIFEST;
890890
 }else if( p->nField>0 || p->zTicketUuid!=0 ){
891
- if( p->rDate<=0.0 ) SYNTAX("missing date for ticket");
891
+ if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
892892
 if( p->zWiki ) SYNTAX("W-card in ticket");
893893
 if( p->zWikiTitle ) SYNTAX("L-card in ticket");
894894
 if( p->zEventId ) SYNTAX("E-card in ticket");
895
- if( p->nField==0 ) SYNTAX("missing J-card in ticket");
895
+ if( p->nField==0 ) SYNTAX("missing J-card on ticket");
896896
 if( p->nTag>0 ) SYNTAX("T-card in ticket");
897
- if( p->zTicketUuid==0 ) SYNTAX("missing K-card in ticket");
898
- if( p->zUser==0 ) SYNTAX("missing U-card in ticket");
897
+ if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
898
+ if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
899899
 if( p->zAttachName ) SYNTAX("A-card in ticket");
900900
 if( p->zMimetype) SYNTAX("N-card in ticket");
901
- if( !seenZ ) SYNTAX("missing Z-card in ticket");
901
+ if( !seenZ ) SYNTAX("missing Z-card on ticket");
902902
 p->type = CFTYPE_TICKET;
903903
 }else if( p->zEventId ){
904
- if( p->rDate<=0.0 ) SYNTAX("missing date for event");
904
+ if( p->rDate<=0.0 ) SYNTAX("missing date on event");
905905
 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
906
- if( p->zWiki==0 ) SYNTAX("missing W-card in event");
906
+ if( p->zWiki==0 ) SYNTAX("missing W-card on event");
907907
 if( p->zAttachName ) SYNTAX("A-card in event");
908908
 for(i=0; i<p->nTag; i++){
909909
 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
910910
 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
911911
 }
912
- if( !seenZ ) SYNTAX("missing Z-card in event");
912
+ if( !seenZ ) SYNTAX("missing Z-card on event");
913913
 p->type = CFTYPE_EVENT;
914914
 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
915915
 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
916916
 if( p->nTag>0 ) SYNTAX("T-card in wiki");
917
- if( p->zWiki==0 ) SYNTAX("missing W-card in wiki");
918
- if( p->zWikiTitle==0 ) SYNTAX("missing L-card in wiki");
917
+ if( p->zWiki==0 ) SYNTAX("missing W-card on wiki");
918
+ if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki");
919919
 if( p->zAttachName ) SYNTAX("A-card in wiki");
920920
 if( !seenZ ) SYNTAX("missing Z-card on wiki");
921921
 p->type = CFTYPE_WIKI;
922
- }else if( p->nTag>0 ){
922
+ }else if( p->zAttachName ){
923
+ if( p->rDate<=0.0 ) SYNTAX("missing date on attachment");
924
+ if( p->nTag>0 ) SYNTAX("T-card in attachment");
925
+ if( !seenZ ) SYNTAX("missing Z-card on attachment");
926
+ p->type = CFTYPE_ATTACHMENT;
927
+ }else if( p->nTag==0 ){
928
+ if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
929
+ p->type = CFTYPE_MANIFEST;
930
+ }else{
923931
 if( p->rDate<=0.0 ) SYNTAX("missing date on tag");
924
- if( p->nParent>0 ) SYNTAX("P-card on tag");
925
- if( p->zAttachName ) SYNTAX("A-card in tag");
932
+ if( p->nParent>0 ) SYNTAX("P-card in tag");
926933
 if( p->zMimetype ) SYNTAX("N-card in tag");
927934
 if( !seenZ ) SYNTAX("missing Z-card on tag");
928935
 for(i=0; i<p->nTag; i++){
929936
 if( p->aTag[i].zUuid==0 ) SYNTAX("self-referential T-card in tag");
930937
 }
931938
 p->type = CFTYPE_CONTROL;
932
- }else if( p->zAttachName ){
933
- if( p->rDate<=0.0 ) SYNTAX("missing date in attachment");
934
- if( !seenZ ) SYNTAX("missing Z-card on attachment");
935
- p->type = CFTYPE_ATTACHMENT;
936
- }else{
937
- if( p->rDate<=0.0 ) SYNTAX("missing date in check-in");
938
- p->type = CFTYPE_MANIFEST;
939939
 }
940940
 md5sum_init();
941941
 if( !isRepeat ) g.parseCnt[p->type]++;
942942
 return p;
943943
944944
--- src/manifest.c
+++ src/manifest.c
@@ -876,68 +876,68 @@
876 SYNTAX("cluster contains a card other than M- or Z-");
877 }
878 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879 p->type = CFTYPE_CLUSTER;
880 }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
881 if( p->rDate<=0.0 ) SYNTAX("missing date for check-in");
882 if( p->nField>0 ) SYNTAX("J-card in check-in");
883 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
884 if( p->zWiki ) SYNTAX("W-card in check-in");
885 if( p->zWikiTitle ) SYNTAX("L-card in check-in");
886 if( p->zEventId ) SYNTAX("E-card in check-in");
887 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
888 if( p->zAttachName ) SYNTAX("A-card in check-in");
889 p->type = CFTYPE_MANIFEST;
890 }else if( p->nField>0 || p->zTicketUuid!=0 ){
891 if( p->rDate<=0.0 ) SYNTAX("missing date for ticket");
892 if( p->zWiki ) SYNTAX("W-card in ticket");
893 if( p->zWikiTitle ) SYNTAX("L-card in ticket");
894 if( p->zEventId ) SYNTAX("E-card in ticket");
895 if( p->nField==0 ) SYNTAX("missing J-card in ticket");
896 if( p->nTag>0 ) SYNTAX("T-card in ticket");
897 if( p->zTicketUuid==0 ) SYNTAX("missing K-card in ticket");
898 if( p->zUser==0 ) SYNTAX("missing U-card in ticket");
899 if( p->zAttachName ) SYNTAX("A-card in ticket");
900 if( p->zMimetype) SYNTAX("N-card in ticket");
901 if( !seenZ ) SYNTAX("missing Z-card in ticket");
902 p->type = CFTYPE_TICKET;
903 }else if( p->zEventId ){
904 if( p->rDate<=0.0 ) SYNTAX("missing date for event");
905 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
906 if( p->zWiki==0 ) SYNTAX("missing W-card in event");
907 if( p->zAttachName ) SYNTAX("A-card in event");
908 for(i=0; i<p->nTag; i++){
909 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
910 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
911 }
912 if( !seenZ ) SYNTAX("missing Z-card in event");
913 p->type = CFTYPE_EVENT;
914 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
915 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
916 if( p->nTag>0 ) SYNTAX("T-card in wiki");
917 if( p->zWiki==0 ) SYNTAX("missing W-card in wiki");
918 if( p->zWikiTitle==0 ) SYNTAX("missing L-card in wiki");
919 if( p->zAttachName ) SYNTAX("A-card in wiki");
920 if( !seenZ ) SYNTAX("missing Z-card on wiki");
921 p->type = CFTYPE_WIKI;
922 }else if( p->nTag>0 ){
 
 
 
 
 
 
 
 
923 if( p->rDate<=0.0 ) SYNTAX("missing date on tag");
924 if( p->nParent>0 ) SYNTAX("P-card on tag");
925 if( p->zAttachName ) SYNTAX("A-card in tag");
926 if( p->zMimetype ) SYNTAX("N-card in tag");
927 if( !seenZ ) SYNTAX("missing Z-card on tag");
928 for(i=0; i<p->nTag; i++){
929 if( p->aTag[i].zUuid==0 ) SYNTAX("self-referential T-card in tag");
930 }
931 p->type = CFTYPE_CONTROL;
932 }else if( p->zAttachName ){
933 if( p->rDate<=0.0 ) SYNTAX("missing date in attachment");
934 if( !seenZ ) SYNTAX("missing Z-card on attachment");
935 p->type = CFTYPE_ATTACHMENT;
936 }else{
937 if( p->rDate<=0.0 ) SYNTAX("missing date in check-in");
938 p->type = CFTYPE_MANIFEST;
939 }
940 md5sum_init();
941 if( !isRepeat ) g.parseCnt[p->type]++;
942 return p;
943
944
--- src/manifest.c
+++ src/manifest.c
@@ -876,68 +876,68 @@
876 SYNTAX("cluster contains a card other than M- or Z-");
877 }
878 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879 p->type = CFTYPE_CLUSTER;
880 }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
881 if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
882 if( p->nField>0 ) SYNTAX("J-card in check-in");
883 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
884 if( p->zWiki ) SYNTAX("W-card in check-in");
885 if( p->zWikiTitle ) SYNTAX("L-card in check-in");
886 if( p->zEventId ) SYNTAX("E-card in check-in");
887 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
888 if( p->zAttachName ) SYNTAX("A-card in check-in");
889 p->type = CFTYPE_MANIFEST;
890 }else if( p->nField>0 || p->zTicketUuid!=0 ){
891 if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
892 if( p->zWiki ) SYNTAX("W-card in ticket");
893 if( p->zWikiTitle ) SYNTAX("L-card in ticket");
894 if( p->zEventId ) SYNTAX("E-card in ticket");
895 if( p->nField==0 ) SYNTAX("missing J-card on ticket");
896 if( p->nTag>0 ) SYNTAX("T-card in ticket");
897 if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
898 if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
899 if( p->zAttachName ) SYNTAX("A-card in ticket");
900 if( p->zMimetype) SYNTAX("N-card in ticket");
901 if( !seenZ ) SYNTAX("missing Z-card on ticket");
902 p->type = CFTYPE_TICKET;
903 }else if( p->zEventId ){
904 if( p->rDate<=0.0 ) SYNTAX("missing date on event");
905 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
906 if( p->zWiki==0 ) SYNTAX("missing W-card on event");
907 if( p->zAttachName ) SYNTAX("A-card in event");
908 for(i=0; i<p->nTag; i++){
909 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
910 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
911 }
912 if( !seenZ ) SYNTAX("missing Z-card on event");
913 p->type = CFTYPE_EVENT;
914 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
915 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
916 if( p->nTag>0 ) SYNTAX("T-card in wiki");
917 if( p->zWiki==0 ) SYNTAX("missing W-card on wiki");
918 if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki");
919 if( p->zAttachName ) SYNTAX("A-card in wiki");
920 if( !seenZ ) SYNTAX("missing Z-card on wiki");
921 p->type = CFTYPE_WIKI;
922 }else if( p->zAttachName ){
923 if( p->rDate<=0.0 ) SYNTAX("missing date on attachment");
924 if( p->nTag>0 ) SYNTAX("T-card in attachment");
925 if( !seenZ ) SYNTAX("missing Z-card on attachment");
926 p->type = CFTYPE_ATTACHMENT;
927 }else if( p->nTag==0 ){
928 if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
929 p->type = CFTYPE_MANIFEST;
930 }else{
931 if( p->rDate<=0.0 ) SYNTAX("missing date on tag");
932 if( p->nParent>0 ) SYNTAX("P-card in tag");
 
933 if( p->zMimetype ) SYNTAX("N-card in tag");
934 if( !seenZ ) SYNTAX("missing Z-card on tag");
935 for(i=0; i<p->nTag; i++){
936 if( p->aTag[i].zUuid==0 ) SYNTAX("self-referential T-card in tag");
937 }
938 p->type = CFTYPE_CONTROL;
 
 
 
 
 
 
 
939 }
940 md5sum_init();
941 if( !isRepeat ) g.parseCnt[p->type]++;
942 return p;
943
944

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button