Compare commits
9 Commits
3a1e9e9250
...
10e1986fe2
| Author | SHA1 | Date | |
|---|---|---|---|
| 10e1986fe2 | |||
| 9eaa71fe2d | |||
| f58ff1785a | |||
| 970ceeb8b0 | |||
| e2f5024a4c | |||
| 8008f37f16 | |||
| c9140bd018 | |||
| ba5ce0a88c | |||
| 398cd57b1d |
|
|
@ -107,12 +107,12 @@ export class Compiler {
|
|||
|
||||
switch (node.type.id) {
|
||||
case terms.Number:
|
||||
// Handle sign prefix for hex and binary literals
|
||||
// Number() doesn't parse '-0xFF' or '+0xFF' correctly
|
||||
// Handle sign prefix for hex, binary, and octal literals
|
||||
// Number() doesn't parse '-0xFF', '+0xFF', '-0o77', etc. correctly
|
||||
let numberValue: number
|
||||
if (value.startsWith('-') && (value.includes('0x') || value.includes('0b'))) {
|
||||
if (value.startsWith('-') && (value.includes('0x') || value.includes('0b') || value.includes('0o'))) {
|
||||
numberValue = -Number(value.slice(1))
|
||||
} else if (value.startsWith('+') && (value.includes('0x') || value.includes('0b'))) {
|
||||
} else if (value.startsWith('+') && (value.includes('0x') || value.includes('0b') || value.includes('0o'))) {
|
||||
numberValue = Number(value.slice(1))
|
||||
} else {
|
||||
numberValue = Number(value)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,15 @@ describe('number literals', () => {
|
|||
expect('0xABCDEF').toEvaluateTo(0xabcdef)
|
||||
})
|
||||
|
||||
test('octal literals', () => {
|
||||
expect('0o644').toEvaluateTo(420)
|
||||
expect('0o755').toEvaluateTo(493)
|
||||
expect('0o777').toEvaluateTo(511)
|
||||
expect('0o10').toEvaluateTo(8)
|
||||
expect('0o0').toEvaluateTo(0)
|
||||
expect('0o123').toEvaluateTo(83)
|
||||
})
|
||||
|
||||
test('decimal literals still work', () => {
|
||||
expect('42').toEvaluateTo(42)
|
||||
expect('3.14').toEvaluateTo(3.14)
|
||||
|
|
@ -27,14 +36,16 @@ describe('number literals', () => {
|
|||
expect('999999').toEvaluateTo(999999)
|
||||
})
|
||||
|
||||
test('negative hex and binary', () => {
|
||||
test('negative hex, binary, and octal', () => {
|
||||
expect('-0xFF').toEvaluateTo(-255)
|
||||
expect('-0b1010').toEvaluateTo(-10)
|
||||
expect('-0o755').toEvaluateTo(-493)
|
||||
})
|
||||
|
||||
test('positive prefix', () => {
|
||||
expect('+0xFF').toEvaluateTo(255)
|
||||
expect('+0b110').toEvaluateTo(6)
|
||||
expect('+0o644').toEvaluateTo(420)
|
||||
expect('+42').toEvaluateTo(42)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
Number {
|
||||
("-" | "+")? "0x" $[0-9a-fA-F]+ |
|
||||
("-" | "+")? "0b" $[01]+ |
|
||||
("-" | "+")? "0o" $[0-7]+ |
|
||||
("-" | "+")? $[0-9]+ ("_"? $[0-9]+)* ('.' $[0-9]+ ("_"? $[0-9]+)*)?
|
||||
}
|
||||
Boolean { "true" | "false" }
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ export const parser = LRParser.deserialize({
|
|||
propSources: [highlighting],
|
||||
skippedNodes: [0,34],
|
||||
repeatNodeCount: 13,
|
||||
tokenData: "K]~R!OOX$RXY$pYZ%ZZp$Rpq$pqr$Rrs%tst'ztu)cuw$Rwx)hxy)myz*Wz{$R{|*q|}$R}!O*q!O!P$R!P!Q2x!Q!R+c!R![.Q![!];e!]!^%Z!^!}$R!}#O<O#O#P=t#P#Q=y#Q#R$R#R#S>d#S#T$R#T#Y>}#Y#Z@i#Z#b>}#b#cFV#c#f>}#f#gGY#g#h>}#h#iH]#i#o>}#o#p$R#p#qJm#q;'S$R;'S;=`$j<%l~$R~O$R~~KWS$WU!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RS$mP;=`<%l$R^$wU!TS#XYOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%bU!TS#_QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%yZ!TSOr%trs&lst%ttu'Vuw%twx'Vx#O%t#O#P'V#P;'S%t;'S;=`'t<%lO%tU&sU!WQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RQ'YTOr'Vrs'is;'S'V;'S;=`'n<%lO'VQ'nO!WQQ'qP;=`<%l'VU'wP;=`<%l%t^(RZrY!TSOY'zYZ$RZt'ztu(tuw'zwx(tx#O'z#O#P(t#P;'S'z;'S;=`)]<%lO'zY(ySrYOY(tZ;'S(t;'S;=`)V<%lO(tY)YP;=`<%l(t^)`P;=`<%l'z~)hO#d~~)mO#b~U)tU!TS#^QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*_U!TS#lQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*vX!TSOt$Ruw$Rx!Q$R!Q!R+c!R![.Q![#O$R#P;'S$R;'S;=`$j<%lO$RU+j`!TS|QOt$Ruw$Rx!O$R!O!P,l!P!Q$R!Q![.Q![#O$R#P#R$R#R#S.}#S#U$R#U#V/l#V#l$R#l#m1Q#m;'S$R;'S;=`$j<%lO$RU,qW!TSOt$Ruw$Rx!Q$R!Q![-Z![#O$R#P;'S$R;'S;=`$j<%lO$RU-bY!TS|QOt$Ruw$Rx!Q$R!Q![-Z![#O$R#P#R$R#R#S,l#S;'S$R;'S;=`$j<%lO$RU.X[!TS|QOt$Ruw$Rx!O$R!O!P,l!P!Q$R!Q![.Q![#O$R#P#R$R#R#S.}#S;'S$R;'S;=`$j<%lO$RU/SW!TSOt$Ruw$Rx!Q$R!Q![.Q![#O$R#P;'S$R;'S;=`$j<%lO$RU/qX!TSOt$Ruw$Rx!Q$R!Q!R0^!R!S0^!S#O$R#P;'S$R;'S;=`$j<%lO$RU0eX!TS|QOt$Ruw$Rx!Q$R!Q!R0^!R!S0^!S#O$R#P;'S$R;'S;=`$j<%lO$RU1V[!TSOt$Ruw$Rx!Q$R!Q![1{![!c$R!c!i1{!i#O$R#P#T$R#T#Z1{#Z;'S$R;'S;=`$j<%lO$RU2S[!TS|QOt$Ruw$Rx!Q$R!Q![1{![!c$R!c!i1{!i#O$R#P#T$R#T#Z1{#Z;'S$R;'S;=`$j<%lO$RU2}W!TSOt$Ruw$Rx!P$R!P!Q3g!Q#O$R#P;'S$R;'S;=`$j<%lO$RU3l^!TSOY4hYZ$RZt4htu5kuw4hwx5kx!P4h!P!Q$R!Q!}4h!}#O:^#O#P7y#P;'S4h;'S;=`;_<%lO4hU4o^!TS!lQOY4hYZ$RZt4htu5kuw4hwx5kx!P4h!P!Q8`!Q!}4h!}#O:^#O#P7y#P;'S4h;'S;=`;_<%lO4hQ5pX!lQOY5kZ!P5k!P!Q6]!Q!}5k!}#O6z#O#P7y#P;'S5k;'S;=`8Y<%lO5kQ6`P!P!Q6cQ6hU!lQ#Z#[6c#]#^6c#a#b6c#g#h6c#i#j6c#m#n6cQ6}VOY6zZ#O6z#O#P7d#P#Q5k#Q;'S6z;'S;=`7s<%lO6zQ7gSOY6zZ;'S6z;'S;=`7s<%lO6zQ7vP;=`<%l6zQ7|SOY5kZ;'S5k;'S;=`8Y<%lO5kQ8]P;=`<%l5kU8eW!TSOt$Ruw$Rx!P$R!P!Q8}!Q#O$R#P;'S$R;'S;=`$j<%lO$RU9Ub!TS!lQOt$Ruw$Rx#O$R#P#Z$R#Z#[8}#[#]$R#]#^8}#^#a$R#a#b8}#b#g$R#g#h8}#h#i$R#i#j8}#j#m$R#m#n8}#n;'S$R;'S;=`$j<%lO$RU:c[!TSOY:^YZ$RZt:^tu6zuw:^wx6zx#O:^#O#P7d#P#Q4h#Q;'S:^;'S;=`;X<%lO:^U;[P;=`<%l:^U;bP;=`<%l4hU;lU!TS!ZQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU<VW#nQ!TSOt$Ruw$Rx!_$R!_!`<o!`#O$R#P;'S$R;'S;=`$j<%lO$RU<tV!TSOt$Ruw$Rx#O$R#P#Q=Z#Q;'S$R;'S;=`$j<%lO$RU=bU#mQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~=yO#e~U>QU#oQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU>kU!TS!bQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU?S^!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#o>}#o;'S$R;'S;=`$j<%lO$RU@VU!RQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@n_!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#UAm#U#o>}#o;'S$R;'S;=`$j<%lO$RUAr`!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#`>}#`#aBt#a#o>}#o;'S$R;'S;=`$j<%lO$RUBy`!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#g>}#g#hC{#h#o>}#o;'S$R;'S;=`$j<%lO$RUDQ`!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#X>}#X#YES#Y#o>}#o;'S$R;'S;=`$j<%lO$RUEZ^!XQ!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#o>}#o;'S$R;'S;=`$j<%lO$R^F^^#fW!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#o>}#o;'S$R;'S;=`$j<%lO$R^Ga^#hW!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#o>}#o;'S$R;'S;=`$j<%lO$R^Hd`#gW!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#f>}#f#gIf#g#o>}#o;'S$R;'S;=`$j<%lO$RUIk`!TSOt$Ruw$Rx}$R}!O>}!O!Q$R!Q![>}![!_$R!_!`@O!`#O$R#P#T$R#T#i>}#i#jC{#j#o>}#o;'S$R;'S;=`$j<%lO$RUJtUuQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~K]O#p~",
|
||||
tokenData: "Lq~R!OOX$RXY$pYZ%ZZp$Rpq$pqr$Rrs%tst'ztu)cuw$Rwx)hxy)myz*Wz{$R{|*q|}$R}!O*q!O!P$R!P!Q4^!Q!R+c!R![.W![!]<y!]!^%Z!^!}$R!}#O=d#O#P?Y#P#Q?_#Q#R$R#R#S?x#S#T$R#T#Y@c#Y#ZA}#Z#b@c#b#cGk#c#f@c#f#gHn#g#h@c#h#iIq#i#o@c#o#p$R#p#qLR#q;'S$R;'S;=`$j<%l~$R~O$R~~LlS$WU!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RS$mP;=`<%l$R^$wU!TS#XYOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%bU!TS#_QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%yZ!TSOr%trs&lst%ttu'Vuw%twx'Vx#O%t#O#P'V#P;'S%t;'S;=`'t<%lO%tU&sU!WQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RQ'YTOr'Vrs'is;'S'V;'S;=`'n<%lO'VQ'nO!WQQ'qP;=`<%l'VU'wP;=`<%l%t^(RZrY!TSOY'zYZ$RZt'ztu(tuw'zwx(tx#O'z#O#P(t#P;'S'z;'S;=`)]<%lO'zY(ySrYOY(tZ;'S(t;'S;=`)V<%lO(tY)YP;=`<%l(t^)`P;=`<%l'z~)hO#d~~)mO#b~U)tU!TS#^QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*_U!TS#lQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*vX!TSOt$Ruw$Rx!Q$R!Q!R+c!R![.W![#O$R#P;'S$R;'S;=`$j<%lO$RU+jb!TS|QOt$Ruw$Rx!O$R!O!P,r!P!Q$R!Q![.W![#O$R#P#R$R#R#S/T#S#U$R#U#V/r#V#c$R#c#d1W#d#l$R#l#m2f#m;'S$R;'S;=`$j<%lO$RU,wW!TSOt$Ruw$Rx!Q$R!Q![-a![#O$R#P;'S$R;'S;=`$j<%lO$RU-hY!TS|QOt$Ruw$Rx!Q$R!Q![-a![#O$R#P#R$R#R#S,r#S;'S$R;'S;=`$j<%lO$RU._[!TS|QOt$Ruw$Rx!O$R!O!P,r!P!Q$R!Q![.W![#O$R#P#R$R#R#S/T#S;'S$R;'S;=`$j<%lO$RU/YW!TSOt$Ruw$Rx!Q$R!Q![.W![#O$R#P;'S$R;'S;=`$j<%lO$RU/wX!TSOt$Ruw$Rx!Q$R!Q!R0d!R!S0d!S#O$R#P;'S$R;'S;=`$j<%lO$RU0kX!TS|QOt$Ruw$Rx!Q$R!Q!R0d!R!S0d!S#O$R#P;'S$R;'S;=`$j<%lO$RU1]W!TSOt$Ruw$Rx!Q$R!Q!Y1u!Y#O$R#P;'S$R;'S;=`$j<%lO$RU1|W!TS|QOt$Ruw$Rx!Q$R!Q!Y1u!Y#O$R#P;'S$R;'S;=`$j<%lO$RU2k[!TSOt$Ruw$Rx!Q$R!Q![3a![!c$R!c!i3a!i#O$R#P#T$R#T#Z3a#Z;'S$R;'S;=`$j<%lO$RU3h[!TS|QOt$Ruw$Rx!Q$R!Q![3a![!c$R!c!i3a!i#O$R#P#T$R#T#Z3a#Z;'S$R;'S;=`$j<%lO$RU4cW!TSOt$Ruw$Rx!P$R!P!Q4{!Q#O$R#P;'S$R;'S;=`$j<%lO$RU5Q^!TSOY5|YZ$RZt5|tu7Puw5|wx7Px!P5|!P!Q$R!Q!}5|!}#O;r#O#P9_#P;'S5|;'S;=`<s<%lO5|U6T^!TS!lQOY5|YZ$RZt5|tu7Puw5|wx7Px!P5|!P!Q9t!Q!}5|!}#O;r#O#P9_#P;'S5|;'S;=`<s<%lO5|Q7UX!lQOY7PZ!P7P!P!Q7q!Q!}7P!}#O8`#O#P9_#P;'S7P;'S;=`9n<%lO7PQ7tP!P!Q7wQ7|U!lQ#Z#[7w#]#^7w#a#b7w#g#h7w#i#j7w#m#n7wQ8cVOY8`Z#O8`#O#P8x#P#Q7P#Q;'S8`;'S;=`9X<%lO8`Q8{SOY8`Z;'S8`;'S;=`9X<%lO8`Q9[P;=`<%l8`Q9bSOY7PZ;'S7P;'S;=`9n<%lO7PQ9qP;=`<%l7PU9yW!TSOt$Ruw$Rx!P$R!P!Q:c!Q#O$R#P;'S$R;'S;=`$j<%lO$RU:jb!TS!lQOt$Ruw$Rx#O$R#P#Z$R#Z#[:c#[#]$R#]#^:c#^#a$R#a#b:c#b#g$R#g#h:c#h#i$R#i#j:c#j#m$R#m#n:c#n;'S$R;'S;=`$j<%lO$RU;w[!TSOY;rYZ$RZt;rtu8`uw;rwx8`x#O;r#O#P8x#P#Q5|#Q;'S;r;'S;=`<m<%lO;rU<pP;=`<%l;rU<vP;=`<%l5|U=QU!TS!ZQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU=kW#nQ!TSOt$Ruw$Rx!_$R!_!`>T!`#O$R#P;'S$R;'S;=`$j<%lO$RU>YV!TSOt$Ruw$Rx#O$R#P#Q>o#Q;'S$R;'S;=`$j<%lO$RU>vU#mQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~?_O#e~U?fU#oQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@PU!TS!bQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@h^!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$RUAkU!RQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RUBS_!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#UCR#U#o@c#o;'S$R;'S;=`$j<%lO$RUCW`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#`@c#`#aDY#a#o@c#o;'S$R;'S;=`$j<%lO$RUD_`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#g@c#g#hEa#h#o@c#o;'S$R;'S;=`$j<%lO$RUEf`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#X@c#X#YFh#Y#o@c#o;'S$R;'S;=`$j<%lO$RUFo^!XQ!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Gr^#fW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Hu^#hW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Ix`#gW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#f@c#f#gJz#g#o@c#o;'S$R;'S;=`$j<%lO$RUKP`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#i@c#i#jEa#j#o@c#o;'S$R;'S;=`$j<%lO$RULYUuQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~LqO#p~",
|
||||
tokenizers: [operatorTokenizer, 1, 2, 3, tokenizer, new LocalTokenGroup("[~RP!O!PU~ZO#`~~", 11)],
|
||||
topRules: {"Program":[0,35]},
|
||||
specialized: [{term: 28, get: (value: any, stack: any) => (specializeKeyword(value, stack) << 1), external: specializeKeyword},{term: 28, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}],
|
||||
|
|
|
|||
|
|
@ -21,6 +21,16 @@ describe('number literals', () => {
|
|||
`)
|
||||
})
|
||||
|
||||
test('octal numbers', () => {
|
||||
expect('0o644').toMatchTree(`
|
||||
Number 0o644
|
||||
`)
|
||||
|
||||
expect('0o055').toMatchTree(`
|
||||
Number 0o055
|
||||
`)
|
||||
})
|
||||
|
||||
test('decimal numbers still work', () => {
|
||||
expect('42').toMatchTree(`
|
||||
Number 42
|
||||
|
|
@ -39,6 +49,12 @@ describe('number literals', () => {
|
|||
`)
|
||||
})
|
||||
|
||||
test('negative octal', () => {
|
||||
expect('-0o755').toMatchTree(`
|
||||
Number -0o755
|
||||
`)
|
||||
})
|
||||
|
||||
test('positive prefix binary', () => {
|
||||
expect('+0b110').toMatchTree(`
|
||||
Number +0b110
|
||||
|
|
@ -51,11 +67,18 @@ describe('number literals', () => {
|
|||
`)
|
||||
})
|
||||
|
||||
test('hex and binary in arrays', () => {
|
||||
expect('[0xFF 0b110 42]').toMatchTree(`
|
||||
test('positive prefix octal', () => {
|
||||
expect('+0o644').toMatchTree(`
|
||||
Number +0o644
|
||||
`)
|
||||
})
|
||||
|
||||
test('hex, binary, and octal in arrays', () => {
|
||||
expect('[0xFF 0b110 0o644 42]').toMatchTree(`
|
||||
Array
|
||||
Number 0xFF
|
||||
Number 0b110
|
||||
Number 0o644
|
||||
Number 42
|
||||
`)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { type Value, toString, toValue } from 'reefvm'
|
||||
import { type Value, toString } from 'reefvm'
|
||||
|
||||
export const dict = {
|
||||
keys: (dict: Record<string, any>) => Object.keys(dict),
|
||||
|
|
|
|||
128
src/prelude/fs.ts
Normal file
128
src/prelude/fs.ts
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
import { join, resolve, basename, dirname, extname } from 'path'
|
||||
import {
|
||||
readdirSync, mkdirSync, rmdirSync,
|
||||
readFileSync, writeFileSync, appendFileSync,
|
||||
rmSync, copyFileSync,
|
||||
statSync, lstatSync, chmodSync, symlinkSync, readlinkSync,
|
||||
watch
|
||||
} from "fs"
|
||||
|
||||
export const fs = {
|
||||
// Directory operations
|
||||
ls: (path: string) => readdirSync(path),
|
||||
mkdir: (path: string) => mkdirSync(path, { recursive: true }),
|
||||
rmdir: (path: string) => rmdirSync(path === '/' || path === '' ? '/tmp/*' : path, { recursive: true }),
|
||||
pwd: () => process.cwd(),
|
||||
cd: (path: string) => process.chdir(path),
|
||||
|
||||
// Reading
|
||||
read: (path: string) => readFileSync(path, 'utf-8'),
|
||||
cat: (path: string) => { }, // added below
|
||||
'read-bytes': (path: string) => [...readFileSync(path)],
|
||||
|
||||
// Writing
|
||||
write: (path: string, content: string) => writeFileSync(path, content),
|
||||
append: (path: string, content: string) => appendFileSync(path, content),
|
||||
|
||||
// File operations
|
||||
delete: (path: string) => rmSync(path),
|
||||
rm: (path: string) => { }, // added below
|
||||
copy: (from: string, to: string) => copyFileSync(from, to),
|
||||
move: (from: string, to: string) => {
|
||||
fs.copy(from, to)
|
||||
fs.rm(from)
|
||||
},
|
||||
mv: (from: string, to: string) => { }, // added below
|
||||
|
||||
// Path operations
|
||||
basename: (path: string) => basename(path),
|
||||
dirname: (path: string) => dirname(path),
|
||||
extname: (path: string) => extname(path),
|
||||
join: (...paths: string[]) => join(...paths),
|
||||
resolve: (...paths: string[]) => resolve(...paths),
|
||||
|
||||
// File info
|
||||
stat: (path: string) => {
|
||||
try {
|
||||
const stats = statSync(path)
|
||||
const record = Object.fromEntries(Object.entries(stats))
|
||||
record['atime'] = record['atimeMs']
|
||||
record['ctime'] = record['ctimeMs']
|
||||
record['mtime'] = record['mtimeMs']
|
||||
|
||||
delete record['atimeMs']
|
||||
delete record['ctimeMs']
|
||||
delete record['mtimeMs']
|
||||
|
||||
return record
|
||||
} catch {
|
||||
return {}
|
||||
}
|
||||
|
||||
},
|
||||
'exists?': (path: string) => {
|
||||
try {
|
||||
statSync(path)
|
||||
return true
|
||||
}
|
||||
catch {
|
||||
return false
|
||||
}
|
||||
},
|
||||
'file?': (path: string) => {
|
||||
try { return statSync(path).isFile() }
|
||||
catch { return false }
|
||||
},
|
||||
'dir?': (path: string) => {
|
||||
try { return statSync(path).isDirectory() }
|
||||
catch { return false }
|
||||
},
|
||||
'symlink?': (path: string) => {
|
||||
try { return lstatSync(path).isSymbolicLink() }
|
||||
catch { return false }
|
||||
},
|
||||
'exec?': (path: string) => {
|
||||
try {
|
||||
const stats = statSync(path)
|
||||
return !!(stats.mode & 0o111)
|
||||
}
|
||||
catch { return false }
|
||||
},
|
||||
size: (path: string) => {
|
||||
try { return statSync(path).size }
|
||||
catch { return 0 }
|
||||
},
|
||||
|
||||
// Permissions
|
||||
chmod: (path: string, mode: number | string) => {
|
||||
const numMode = typeof mode === 'string' ? parseInt(mode, 8) : mode
|
||||
chmodSync(path, numMode)
|
||||
},
|
||||
|
||||
// Symlinks
|
||||
symlink: (target: string, path: string) => symlinkSync(target, path),
|
||||
readlink: (path: string) => readlinkSync(path, 'utf-8'),
|
||||
|
||||
// Other
|
||||
glob: (pattern: string) => {
|
||||
const dir = pattern.substring(0, pattern.lastIndexOf('/'))
|
||||
const match = pattern.substring(pattern.lastIndexOf('/') + 1)
|
||||
|
||||
if (!match.includes('*')) throw new Error('only * patterns supported')
|
||||
|
||||
const ext = match.split('*').pop()!
|
||||
return readdirSync(dir)
|
||||
.filter((f) => f.endsWith(ext))
|
||||
.map((f) => join(dir, f))
|
||||
|
||||
},
|
||||
|
||||
watch: (path: string, callback: Function) =>
|
||||
watch(path, (event, filename) => callback(event, filename)),
|
||||
}
|
||||
|
||||
|
||||
; (fs as any).cat = fs.read
|
||||
; (fs as any).mv = fs.move
|
||||
; (fs as any).cp = fs.copy
|
||||
; (fs as any).rm = fs.delete
|
||||
|
|
@ -6,6 +6,7 @@ import {
|
|||
} from 'reefvm'
|
||||
|
||||
import { dict } from './dict'
|
||||
import { fs } from './fs'
|
||||
import { json } from './json'
|
||||
import { load } from './load'
|
||||
import { list } from './list'
|
||||
|
|
@ -14,6 +15,7 @@ import { str } from './str'
|
|||
|
||||
export const globals = {
|
||||
dict,
|
||||
fs,
|
||||
json,
|
||||
load,
|
||||
list,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ export const load = async function (this: VM, path: string): Promise<Record<stri
|
|||
const scope = this.scope
|
||||
const pc = this.pc
|
||||
|
||||
const fullPath = resolve(path) + '.sh'
|
||||
let fullPath = resolve(path)
|
||||
if (!path.includes('.')) fullPath += '.sh'
|
||||
|
||||
const code = readFileSync(fullPath, 'utf-8')
|
||||
|
||||
this.pc = this.instructions.length
|
||||
|
|
|
|||
329
src/prelude/tests/fs.test.ts
Normal file
329
src/prelude/tests/fs.test.ts
Normal file
|
|
@ -0,0 +1,329 @@
|
|||
import { expect, describe, test, beforeEach, afterEach } from 'bun:test'
|
||||
import { mkdirSync, writeFileSync, rmSync, existsSync } from 'fs'
|
||||
import { join, resolve } from 'path'
|
||||
import { fs } from '../fs'
|
||||
|
||||
const TEST_DIR = resolve('./tmp/shrimp-fs-test')
|
||||
const CWD = process.cwd()
|
||||
|
||||
beforeEach(() => {
|
||||
if (existsSync(TEST_DIR)) {
|
||||
rmSync(TEST_DIR, { recursive: true })
|
||||
}
|
||||
mkdirSync(TEST_DIR, { recursive: true })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
process.chdir(CWD)
|
||||
if (existsSync(TEST_DIR)) {
|
||||
rmSync(TEST_DIR, { recursive: true })
|
||||
}
|
||||
})
|
||||
|
||||
describe('fs - directory operations', () => {
|
||||
test('fs.ls lists directory contents', () => {
|
||||
writeFileSync(join(TEST_DIR, 'file1.txt'), 'content1')
|
||||
writeFileSync(join(TEST_DIR, 'file2.txt'), 'content2')
|
||||
|
||||
const result = fs.ls(TEST_DIR)
|
||||
expect(result).toContain('file1.txt')
|
||||
expect(result).toContain('file2.txt')
|
||||
})
|
||||
|
||||
test('fs.mkdir creates directory', () => {
|
||||
const newDir = join(TEST_DIR, 'newdir')
|
||||
fs.mkdir(newDir)
|
||||
expect(existsSync(newDir)).toBe(true)
|
||||
})
|
||||
|
||||
test('fs.rmdir removes empty directory', () => {
|
||||
const dir = join(TEST_DIR, 'toremove')
|
||||
mkdirSync(dir)
|
||||
fs.rmdir(dir)
|
||||
expect(existsSync(dir)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.pwd returns current working directory', () => {
|
||||
const result = fs.pwd()
|
||||
expect(typeof result).toBe('string')
|
||||
expect(result.length).toBeGreaterThan(0)
|
||||
})
|
||||
|
||||
test('fs.cd changes current working directory', () => {
|
||||
const originalCwd = process.cwd()
|
||||
fs.cd(TEST_DIR)
|
||||
expect(process.cwd()).toBe(TEST_DIR)
|
||||
process.chdir(originalCwd) // restore
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - reading', () => {
|
||||
test('fs.read reads file contents as string', () => {
|
||||
const file = join(TEST_DIR, 'test.txt')
|
||||
writeFileSync(file, 'hello world')
|
||||
|
||||
const result = fs.read(file)
|
||||
expect(result).toBe('hello world')
|
||||
})
|
||||
|
||||
test('fs.cat is alias for fs.read', () => {
|
||||
const file = join(TEST_DIR, 'test.txt')
|
||||
writeFileSync(file, 'hello world')
|
||||
|
||||
const result = fs.cat(file)
|
||||
expect(result).toBe('hello world')
|
||||
})
|
||||
|
||||
test('fs.read-bytes reads file as buffer', () => {
|
||||
const file = join(TEST_DIR, 'test.bin')
|
||||
writeFileSync(file, Buffer.from([1, 2, 3, 4]))
|
||||
|
||||
const result = fs['read-bytes'](file)
|
||||
expect(result).toBeInstanceOf(Array)
|
||||
expect(result).toEqual([1, 2, 3, 4])
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - writing', () => {
|
||||
test('fs.write writes string to file', async () => {
|
||||
const file = join(TEST_DIR, 'output.txt')
|
||||
fs.write(file, 'test content')
|
||||
|
||||
const content = Bun.file(file).text()
|
||||
expect(await content).toBe('test content')
|
||||
})
|
||||
|
||||
test('fs.append appends to existing file', async () => {
|
||||
const file = join(TEST_DIR, 'append.txt')
|
||||
writeFileSync(file, 'first')
|
||||
fs.append(file, ' second')
|
||||
|
||||
const content = await Bun.file(file).text()
|
||||
expect(content).toBe('first second')
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - file operations', () => {
|
||||
test('fs.rm removes file', () => {
|
||||
const file = join(TEST_DIR, 'remove.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
fs.rm(file)
|
||||
expect(existsSync(file)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.delete is alias for fs.rm', () => {
|
||||
const file = join(TEST_DIR, 'delete.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
fs.delete(file)
|
||||
expect(existsSync(file)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.copy copies file', async () => {
|
||||
const src = join(TEST_DIR, 'source.txt')
|
||||
const dest = join(TEST_DIR, 'dest.txt')
|
||||
writeFileSync(src, 'content')
|
||||
|
||||
fs.copy(src, dest)
|
||||
expect(await Bun.file(dest).text()).toBe('content')
|
||||
})
|
||||
|
||||
test('fs.cp is alias for fs.copy', async () => {
|
||||
const src = join(TEST_DIR, 'source2.txt')
|
||||
const dest = join(TEST_DIR, 'dest2.txt')
|
||||
writeFileSync(src, 'content')
|
||||
|
||||
fs.cp(src, dest)
|
||||
expect(await Bun.file(dest).text()).toBe('content')
|
||||
})
|
||||
|
||||
test('fs.move moves file', async () => {
|
||||
const src = join(TEST_DIR, 'source.txt')
|
||||
const dest = join(TEST_DIR, 'moved.txt')
|
||||
writeFileSync(src, 'content')
|
||||
|
||||
fs.move(src, dest)
|
||||
expect(existsSync(src)).toBe(false)
|
||||
expect(await Bun.file(dest).text()).toBe('content')
|
||||
})
|
||||
|
||||
test('fs.mv is alias for fs.move', async () => {
|
||||
const src = join(TEST_DIR, 'source2.txt')
|
||||
const dest = join(TEST_DIR, 'moved2.txt')
|
||||
writeFileSync(src, 'content')
|
||||
|
||||
fs.mv(src, dest)
|
||||
expect(existsSync(src)).toBe(false)
|
||||
expect(await Bun.file(dest).text()).toBe('content')
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - path operations', () => {
|
||||
test('fs.basename extracts filename from path', () => {
|
||||
expect(fs.basename('/path/to/file.txt')).toBe('file.txt')
|
||||
expect(fs.basename('/path/to/dir/')).toBe('dir')
|
||||
})
|
||||
|
||||
test('fs.dirname extracts directory from path', () => {
|
||||
expect(fs.dirname('/path/to/file.txt')).toBe('/path/to')
|
||||
expect(fs.dirname('/path/to/dir/')).toBe('/path/to')
|
||||
})
|
||||
|
||||
test('fs.extname extracts file extension', () => {
|
||||
expect(fs.extname('file.txt')).toBe('.txt')
|
||||
expect(fs.extname('file.tar.gz')).toBe('.gz')
|
||||
expect(fs.extname('noext')).toBe('')
|
||||
})
|
||||
|
||||
test('fs.join joins path segments', () => {
|
||||
expect(fs.join('path', 'to', 'file.txt')).toBe('path/to/file.txt')
|
||||
expect(fs.join('/absolute', 'path')).toBe('/absolute/path')
|
||||
})
|
||||
|
||||
test('fs.resolve resolves to absolute path', () => {
|
||||
const result = fs.resolve('relative', 'path')
|
||||
expect(result.startsWith('/')).toBe(true)
|
||||
expect(result).toContain('relative')
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - file info', () => {
|
||||
test('fs.stat returns file stats', () => {
|
||||
const file = join(TEST_DIR, 'stat.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
const stats = fs.stat(file)
|
||||
expect(stats).toHaveProperty('size')
|
||||
expect(stats).toHaveProperty('mtime')
|
||||
expect(stats.size).toBe(7) // 'content' is 7 bytes
|
||||
})
|
||||
|
||||
test('fs.exists? checks if path exists', () => {
|
||||
const file = join(TEST_DIR, 'exists.txt')
|
||||
expect(fs['exists?'](file)).toBe(false)
|
||||
|
||||
writeFileSync(file, 'content')
|
||||
expect(fs['exists?'](file)).toBe(true)
|
||||
})
|
||||
|
||||
test('fs.file? checks if path is a file', () => {
|
||||
const file = join(TEST_DIR, 'isfile.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
expect(fs['file?'](file)).toBe(true)
|
||||
expect(fs['file?'](TEST_DIR)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.dir? checks if path is a directory', () => {
|
||||
const dir = join(TEST_DIR, 'isdir')
|
||||
mkdirSync(dir)
|
||||
|
||||
expect(fs['dir?'](dir)).toBe(true)
|
||||
expect(fs['dir?'](join(TEST_DIR, 'isfile.txt'))).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.symlink? checks if path is a symbolic link', () => {
|
||||
const file = join(TEST_DIR, 'target.txt')
|
||||
const link = join(TEST_DIR, 'link.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
fs.symlink(file, link)
|
||||
expect(fs['symlink?'](link)).toBe(true)
|
||||
expect(fs['symlink?'](file)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.exec? checks if file is executable', () => {
|
||||
const file = join(TEST_DIR, 'script.sh')
|
||||
writeFileSync(file, '#!/bin/bash\necho hello')
|
||||
|
||||
fs.chmod(file, 0o755)
|
||||
expect(fs['exec?'](file)).toBe(true)
|
||||
|
||||
fs.chmod(file, 0o644)
|
||||
expect(fs['exec?'](file)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.size returns file size in bytes', () => {
|
||||
const file = join(TEST_DIR, 'sizeme.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
expect(fs.size(file)).toBe(7) // 'content' is 7 bytes
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - permissions', () => {
|
||||
test('fs.chmod changes file permissions with octal number', () => {
|
||||
const file = join(TEST_DIR, 'perms.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
fs.chmod(file, 0o755)
|
||||
expect(fs['exec?'](file)).toBe(true)
|
||||
|
||||
fs.chmod(file, 0o644)
|
||||
expect(fs['exec?'](file)).toBe(false)
|
||||
})
|
||||
|
||||
test('fs.chmod changes file permissions with string', () => {
|
||||
const file = join(TEST_DIR, 'perms2.txt')
|
||||
writeFileSync(file, 'content')
|
||||
|
||||
fs.chmod(file, '755')
|
||||
expect(fs['exec?'](file)).toBe(true)
|
||||
|
||||
fs.chmod(file, '644')
|
||||
expect(fs['exec?'](file)).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - symlinks', () => {
|
||||
test('fs.symlink creates symbolic link', () => {
|
||||
const target = join(TEST_DIR, 'target.txt')
|
||||
const link = join(TEST_DIR, 'link.txt')
|
||||
writeFileSync(target, 'content')
|
||||
|
||||
fs.symlink(target, link)
|
||||
expect(fs['symlink?'](link)).toBe(true)
|
||||
expect(fs.read(link)).toBe('content')
|
||||
})
|
||||
|
||||
test('fs.readlink reads symbolic link target', () => {
|
||||
const target = join(TEST_DIR, 'target.txt')
|
||||
const link = join(TEST_DIR, 'link.txt')
|
||||
writeFileSync(target, 'content')
|
||||
|
||||
fs.symlink(target, link)
|
||||
expect(fs.readlink(link)).toBe(target)
|
||||
})
|
||||
})
|
||||
|
||||
describe('fs - other', () => {
|
||||
test('fs.glob matches file patterns', () => {
|
||||
writeFileSync(join(TEST_DIR, 'file1.txt'), '')
|
||||
writeFileSync(join(TEST_DIR, 'file2.txt'), '')
|
||||
writeFileSync(join(TEST_DIR, 'file3.md'), '')
|
||||
|
||||
const result = fs.glob(join(TEST_DIR, '*.txt'))
|
||||
expect(result).toHaveLength(2)
|
||||
expect(result).toContain(join(TEST_DIR, 'file1.txt'))
|
||||
expect(result).toContain(join(TEST_DIR, 'file2.txt'))
|
||||
})
|
||||
|
||||
test('fs.watch calls callback on file change', async () => {
|
||||
const file = join(TEST_DIR, 'watch.txt')
|
||||
writeFileSync(file, 'initial')
|
||||
|
||||
let called = false
|
||||
const watcher = fs.watch(file, () => { called = true })
|
||||
|
||||
// Trigger change
|
||||
await new Promise(resolve => setTimeout(resolve, 100))
|
||||
writeFileSync(file, 'updated')
|
||||
|
||||
// Wait for watcher
|
||||
await new Promise(resolve => setTimeout(resolve, 500))
|
||||
|
||||
expect(called).toBe(true)
|
||||
watcher.close?.()
|
||||
})
|
||||
})
|
||||
|
|
@ -1,41 +1,41 @@
|
|||
import { expect, describe, test } from 'bun:test'
|
||||
import { globals } from '#prelude'
|
||||
|
||||
describe('use', () => {
|
||||
describe('loading a file', () => {
|
||||
test(`imports all a file's functions`, async () => {
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math.double 4
|
||||
`).toEvaluateTo(8, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math.double (math.double 4)
|
||||
`).toEvaluateTo(16, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
dbl = math.double
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
dbl = ref math.double
|
||||
dbl (dbl 2)
|
||||
`).toEvaluateTo(8, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math.pi
|
||||
`).toEvaluateTo(3.14, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math | at 🥧
|
||||
`).toEvaluateTo(3.14159265359, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math.🥧
|
||||
`).toEvaluateTo(3.14159265359, globals)
|
||||
|
||||
expect(`
|
||||
math = load ./src/prelude/tests/math
|
||||
math = load ./src/prelude/tests/math.sh
|
||||
math.add1 5
|
||||
`).toEvaluateTo(6, globals)
|
||||
})
|
||||
Loading…
Reference in New Issue
Block a user