Skip to content

Commit ac5eaf3

Browse files
committed
better branch ordering, probably
1 parent 850f3b7 commit ac5eaf3

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

jsrc/ws.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,38 +58,38 @@ static US spellouttab[256] = {
5858
[CLBRACE]=(UC)'{',[CSTILE]=(UC)'|',[CRBRACE]=(UC)'}',[CTILDE]=(UC)'~',
5959
[CLPAR]=(UC)'(', [CRPAR]=(UC)')',
6060
// 127 free
61-
[CASGN ]=(UC)'='+DOT0, [CGASGN ]=(UC)'='+CO0, [CFLOOR ]=(UC)'<'+DOT0,
62-
[CLE ]=(UC)'<'+CO0, [CCEIL ]=(UC)'>'+DOT0, [CGE ]=(UC)'>'+CO0,
63-
[CUSDOT ]=(UC)'_'+DOT0, [CPLUSDOT]=(UC)'+'+DOT0, [CPLUSCO ]=(UC)'+'+CO0, [CSTARDOT]=(UC)'*'+DOT0,
61+
[CASGN ]=(UC)'='+DOT0, [CGASGN ]=(UC)'='+CO0, [CFLOOR ]=(UC)'<'+DOT0,
62+
[CLE ]=(UC)'<'+CO0, [CCEIL ]=(UC)'>'+DOT0, [CGE ]=(UC)'>'+CO0,
63+
[CUSDOT ]=(UC)'_'+DOT0, [CPLUSDOT]=(UC)'+'+DOT0, [CPLUSCO ]=(UC)'+'+CO0, [CSTARDOT]=(UC)'*'+DOT0,
6464
[CSTARCO ]=(UC)'*'+CO0, [CNOT ]=(UC)'-'+DOT0,
65-
[CMATCH ]=(UC)'-'+CO0, [CDOMINO ]=(UC)'%'+DOT0, [CSQRT ]=(UC)'%'+CO0,
66-
[CLOG ]=(UC)'^'+DOT0, [CPOWOP ]=(UC)'^'+CO0, [CSPARSE ]=(UC)'$'+DOT0, [CSELF ]=(UC)'$'+CO0,
67-
[CNUB ]=(UC)'~'+DOT0, [CNE ]=(UC)'~'+CO0, [CREV ]=(UC)'|'+DOT0,
65+
[CMATCH ]=(UC)'-'+CO0, [CDOMINO ]=(UC)'%'+DOT0, [CSQRT ]=(UC)'%'+CO0,
66+
[CLOG ]=(UC)'^'+DOT0, [CPOWOP ]=(UC)'^'+CO0, [CSPARSE ]=(UC)'$'+DOT0, [CSELF ]=(UC)'$'+CO0,
67+
[CNUB ]=(UC)'~'+DOT0, [CNE ]=(UC)'~'+CO0, [CREV ]=(UC)'|'+DOT0,
6868
[CCANT ]=(UC)'|'+CO0, [COBVERSE]=(UC)':'+DOT0,
69-
[CADVERSE]=(UC)':'+CO0, [CCOMDOT ]=(UC)','+DOT0, [CLAMIN ]=(UC)','+CO0, [CCUT ]=(UC)';'+DOT0,
70-
[CWORDS ]=(UC)';'+CO0, [CBASE ]=(UC)'#'+DOT0, [CABASE ]=(UC)'#'+CO0, [CFIT ]=(UC)'!'+DOT0,
71-
[CIBEAM ]=(UC)'!'+CO0, [CSLDOT ]=(UC)'/'+DOT0, [CGRADE ]=(UC)'/'+CO0, [CBSDOT ]=(UC)'\\'+DOT0,
72-
[CDGRADE ]=(UC)'\\'+CO0, [CLEV ]=(UC)'['+DOT0, [CCAP ]=(UC)'['+CO0,
73-
[CDEX ]=(UC)']'+DOT0, [CIDENT ]=(UC)']'+CO0,
74-
[CHEAD ]=(UC)'{'+DOT0, [CTAIL ]=(UC)'{'+CO0,
75-
[CBEHEAD ]=(UC)'}'+DOT0, [CCTAIL ]=(UC)'}'+CO0, [CEXEC ]=(UC)'"'+DOT0,
76-
[CTHORN ]=(UC)'"'+CO0, [CGRDOT ]=(UC)'`'+DOT0, [CGRCO ]=(UC)'`'+CO0, [CATDOT ]=(UC)'@'+DOT0,
77-
[CATCO ]=(UC)'@'+CO0, [CAMPCO ]=(UC)'&'+CO0, [CUNDER ]=(UC)'&'+DOT0,
78-
[CQRYDOT ]=(UC)'?'+DOT0, [CQRYCO ]=(UC)'?'+CO0, [CALP ]=(UC)'a'+DOT0, [CATOMIC ]=(UC)'A'+DOT0,
79-
[CACE ]=(UC)'a'+CO0, [CBDOT ]=(UC)'b'+DOT0, [CCDOT ]=(UC)'c'+DOT0, [CCYCLE ]=(UC)'C'+DOT0,
80-
[CEPS ]=(UC)'e'+DOT0, [CEBAR ]=(UC)'E'+DOT0, [CFIX ]=(UC)'f'+DOT0, [CFCAPCO ]=(UC)'F'+CO0,
81-
[CHGEOM ]=(UC)'H'+DOT0, [CIOTA ]=(UC)'i'+DOT0, [CICO ]=(UC)'i'+CO0, [CICAP ]=(UC)'I'+DOT0,
82-
[CICAPCO ]=(UC)'I'+CO0, [CJDOT ]=(UC)'j'+DOT0, [CLDOT ]=(UC)'L'+DOT0, [CLCAPCO ]=(UC)'L'+CO0,
83-
[CMDOT ]=(UC)'m'+DOT0, [CMCAP ]=(UC)'M'+DOT0, [CNDOT ]=(UC)'n'+DOT0, [CCIRCLE ]=(UC)'o'+DOT0,
84-
[CPOLY ]=(UC)'p'+DOT0, [CPCO ]=(UC)'p'+CO0, [CQCAPCO ]=(UC)'Q'+CO0, [CQCO ]=(UC)'q'+CO0,
85-
[CRDOT ]=(UC)'r'+DOT0, [CSCO ]=(UC)'s'+CO0, [CSCAPCO ]=(UC)'S'+CO0,
86-
[CTDOT ]=(UC)'t'+DOT0, [CTCAPDOT ]=(UC)'T'+DOT0,
87-
[CUDOT ]=(UC)'u'+DOT0, [CVDOT ]=(UC)'v'+DOT0,
69+
[CADVERSE]=(UC)':'+CO0, [CCOMDOT ]=(UC)','+DOT0, [CLAMIN ]=(UC)','+CO0, [CCUT ]=(UC)';'+DOT0,
70+
[CWORDS ]=(UC)';'+CO0, [CBASE ]=(UC)'#'+DOT0, [CABASE ]=(UC)'#'+CO0, [CFIT ]=(UC)'!'+DOT0,
71+
[CIBEAM ]=(UC)'!'+CO0, [CSLDOT ]=(UC)'/'+DOT0, [CGRADE ]=(UC)'/'+CO0, [CBSDOT ]=(UC)'\\'+DOT0,
72+
[CDGRADE ]=(UC)'\\'+CO0, [CLEV ]=(UC)'['+DOT0, [CCAP ]=(UC)'['+CO0,
73+
[CDEX ]=(UC)']'+DOT0, [CIDENT ]=(UC)']'+CO0,
74+
[CHEAD ]=(UC)'{'+DOT0, [CTAIL ]=(UC)'{'+CO0,
75+
[CBEHEAD ]=(UC)'}'+DOT0, [CCTAIL ]=(UC)'}'+CO0, [CEXEC ]=(UC)'"'+DOT0,
76+
[CTHORN ]=(UC)'"'+CO0, [CGRDOT ]=(UC)'`'+DOT0, [CGRCO ]=(UC)'`'+CO0, [CATDOT ]=(UC)'@'+DOT0,
77+
[CATCO ]=(UC)'@'+CO0, [CAMPCO ]=(UC)'&'+CO0, [CUNDER ]=(UC)'&'+DOT0,
78+
[CQRYDOT ]=(UC)'?'+DOT0, [CQRYCO ]=(UC)'?'+CO0, [CALP ]=(UC)'a'+DOT0, [CATOMIC ]=(UC)'A'+DOT0,
79+
[CACE ]=(UC)'a'+CO0, [CBDOT ]=(UC)'b'+DOT0, [CCDOT ]=(UC)'c'+DOT0, [CCYCLE ]=(UC)'C'+DOT0,
80+
[CEPS ]=(UC)'e'+DOT0, [CEBAR ]=(UC)'E'+DOT0, [CFIX ]=(UC)'f'+DOT0, [CFCAPCO ]=(UC)'F'+CO0,
81+
[CHGEOM ]=(UC)'H'+DOT0, [CIOTA ]=(UC)'i'+DOT0, [CICO ]=(UC)'i'+CO0, [CICAP ]=(UC)'I'+DOT0,
82+
[CICAPCO ]=(UC)'I'+CO0, [CJDOT ]=(UC)'j'+DOT0, [CLDOT ]=(UC)'L'+DOT0, [CLCAPCO ]=(UC)'L'+CO0,
83+
[CMDOT ]=(UC)'m'+DOT0, [CMCAP ]=(UC)'M'+DOT0, [CNDOT ]=(UC)'n'+DOT0, [CCIRCLE ]=(UC)'o'+DOT0,
84+
[CPOLY ]=(UC)'p'+DOT0, [CPCO ]=(UC)'p'+CO0, [CQCAPCO ]=(UC)'Q'+CO0, [CQCO ]=(UC)'q'+CO0,
85+
[CRDOT ]=(UC)'r'+DOT0, [CSCO ]=(UC)'s'+CO0, [CSCAPCO ]=(UC)'S'+CO0,
86+
[CTDOT ]=(UC)'t'+DOT0, [CTCAPDOT ]=(UC)'T'+DOT0,
87+
[CUDOT ]=(UC)'u'+DOT0, [CVDOT ]=(UC)'v'+DOT0,
8888
[CUCO ]=(UC)'u'+CO0, [CXCO ]=(UC)'x'+CO0,
89-
[CFCONS ]=(UC)'0'+CO0, [CAMIP ]=(UC)'}', [CCASEV ]=(UC)'}', [CFETCH ]=(UC)'{'+CO0+CO1,
90-
[CMAP ]=(UC)'{'+CO0+CO1,[CEMEND ]=(UC)'}'+CO0+CO1,[CUNDCO ]=(UC)'&'+DOT0+CO1,[CPDERIV ]=(UC)'p'+DOT0+DOT1,
91-
[CFDOT ]=(UC)'F'+DOT0, [CFDOTCO ]=(UC)'F'+DOT0+CO1,[CFDOTDOT]=(UC)'F'+DOT0+DOT1,[CZCO ]=(UC)'Z'+CO0,
92-
[CFCO ]=(UC)'F'+CO0, [CFCOCO ]=(UC)'F'+CO0+CO1,[CFCODOT ]=(UC)'F'+CO0+DOT1, [CSLDOTDOT]=(UC)'/'+DOT0+DOT1,
89+
[CFCONS ]=(UC)'0'+CO0, [CAMIP ]=(UC)'}', [CCASEV ]=(UC)'}', [CFETCH ]=(UC)'{'+CO0+CO1,
90+
[CMAP ]=(UC)'{'+CO0+CO1, [CEMEND ]=(UC)'}'+CO0+CO1, [CUNDCO ]=(UC)'&'+DOT0+CO1, [CPDERIV ]=(UC)'p'+DOT0+DOT1,
91+
[CFDOT ]=(UC)'F'+DOT0, [CFDOTCO ]=(UC)'F'+DOT0+CO1, [CFDOTDOT]=(UC)'F'+DOT0+DOT1, [CZCO ]=(UC)'Z'+CO0,
92+
[CFCO ]=(UC)'F'+CO0, [CFCOCO ]=(UC)'F'+CO0+CO1, [CFCODOT ]=(UC)'F'+CO0+DOT1, [CSLDOTDOT]=(UC)'/'+DOT0+DOT1,
9393
};
9494
// *s is a string with length n representing a primitive. Convert the primitive to
9595
// a 1-byte pseudocharacter number. Return value of 0 means error. This is called to audit ARs & thus must work with unverified input
@@ -112,7 +112,7 @@ C spellin(I n,C*s){
112112
R *bp; // return the character
113113
}else{
114114
// must be _n: for n a digit or _
115-
R (s[1]=='_'||BETWEENC(s[1],'0','9'))&&s[2]==CESC2?CFCONS:0;
115+
R (BETWEENC(s[1],'0','9')||s[1]=='_')&&s[2]==CESC2?CFCONS:0;
116116
}
117117
}
118118
// s is a buffer long enough to hold the longest spelling. Fill it with the spelling of c

0 commit comments

Comments
 (0)