Rename the !?? effect to ?

This commit is contained in:
Nigel Tao committed 2018-12-29 13:57:57 +11:00
1 parent 1ea32b3745
commit 093268e179
11 files changed
+172 -172

No files matched your search

+11 -7
View File
@@ -109,8 +109,12 @@ func (f Flags) AsEffect() Effect { return Effect(f) }
type Effect uint8
const (
EffectImpure = Effect(0x01)
EffectCoroutine = Effect(0x02)
EffectPure = Effect(0)
EffectImpure = Effect(effectBitImpure)
EffectImpureCoroutine = Effect(effectBitImpure | effectBitCoroutine)
effectBitImpure = 0x01
effectBitCoroutine = 0x02
effectMask = Effect(0xFF)
)
@@ -118,19 +122,19 @@ const (
func (e Effect) AsFlags() Flags { return Flags(e) }
func (e Effect) Pure() bool { return e == 0 }
func (e Effect) Impure() bool { return e&EffectImpure != 0 }
func (e Effect) Coroutine() bool { return e&EffectCoroutine != 0 }
func (e Effect) Impure() bool { return e&effectBitImpure != 0 }
func (e Effect) Coroutine() bool { return e&effectBitCoroutine != 0 }
func (e Effect) WeakerThan(o Effect) bool { return e < o }
func (e Effect) String() string {
switch e & effectMask {
case 0:
case EffectPure:
return ""
case EffectImpure:
return "!"
case EffectImpure | EffectCoroutine:
return "!??"
case EffectImpureCoroutine:
return "?"
}
return "‽INVALID_EFFECT‽"
}
+41 -41
View File
@@ -139,34 +139,34 @@ var Funcs = []string{
"io_reader.can_undo_byte() bool",
"io_reader.undo_byte!()",
"io_reader.read_u8!??() u8",
"io_reader.read_u8?() u8",
"io_reader.read_u16be!??() u16",
"io_reader.read_u16le!??() u16",
"io_reader.read_u16be?() u16",
"io_reader.read_u16le?() u16",
"io_reader.read_u8_as_u32!??() u32[..0xFF]",
"io_reader.read_u16be_as_u32!??() u32[..0xFFFF]",
"io_reader.read_u16le_as_u32!??() u32[..0xFFFF]",
"io_reader.read_u24be_as_u32!??() u32[..0xFFFFFF]",
"io_reader.read_u24le_as_u32!??() u32[..0xFFFFFF]",
"io_reader.read_u32be!??() u32",
"io_reader.read_u32le!??() u32",
"io_reader.read_u8_as_u32?() u32[..0xFF]",
"io_reader.read_u16be_as_u32?() u32[..0xFFFF]",
"io_reader.read_u16le_as_u32?() u32[..0xFFFF]",
"io_reader.read_u24be_as_u32?() u32[..0xFFFFFF]",
"io_reader.read_u24le_as_u32?() u32[..0xFFFFFF]",
"io_reader.read_u32be?() u32",
"io_reader.read_u32le?() u32",
"io_reader.read_u8_as_u64!??() u64[..0xFF]",
"io_reader.read_u16be_as_u64!??() u64[..0xFFFF]",
"io_reader.read_u16le_as_u64!??() u64[..0xFFFF]",
"io_reader.read_u24be_as_u64!??() u64[..0xFFFFFF]",
"io_reader.read_u24le_as_u64!??() u64[..0xFFFFFF]",
"io_reader.read_u32be_as_u64!??() u64[..0xFFFFFFFF]",
"io_reader.read_u32le_as_u64!??() u64[..0xFFFFFFFF]",
"io_reader.read_u40be_as_u64!??() u64[..0xFFFFFFFFFF]",
"io_reader.read_u40le_as_u64!??() u64[..0xFFFFFFFFFF]",
"io_reader.read_u48be_as_u64!??() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u48le_as_u64!??() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u56be_as_u64!??() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u56le_as_u64!??() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u64be!??() u64",
"io_reader.read_u64le!??() u64",
"io_reader.read_u8_as_u64?() u64[..0xFF]",
"io_reader.read_u16be_as_u64?() u64[..0xFFFF]",
"io_reader.read_u16le_as_u64?() u64[..0xFFFF]",
"io_reader.read_u24be_as_u64?() u64[..0xFFFFFF]",
"io_reader.read_u24le_as_u64?() u64[..0xFFFFFF]",
"io_reader.read_u32be_as_u64?() u64[..0xFFFFFFFF]",
"io_reader.read_u32le_as_u64?() u64[..0xFFFFFFFF]",
"io_reader.read_u40be_as_u64?() u64[..0xFFFFFFFFFF]",
"io_reader.read_u40le_as_u64?() u64[..0xFFFFFFFFFF]",
"io_reader.read_u48be_as_u64?() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u48le_as_u64?() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u56be_as_u64?() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u56le_as_u64?() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u64be?() u64",
"io_reader.read_u64le?() u64",
// TODO: these should have an explicit pre-condition "available() >= N".
// For now, that's implicitly checked (i.e. hard coded).
@@ -212,7 +212,7 @@ var Funcs = []string{
"io_reader.since_mark() slice u8",
"io_reader.take!(n u64) slice u8",
"io_reader.skip!??(n u32)",
"io_reader.skip?(n u32)",
// TODO: this should have explicit pre-conditions "actual <= worst_case"
// and "worst_case <= available()". As an implementation restriction, we
@@ -222,21 +222,21 @@ var Funcs = []string{
// ---- io_writer
"io_writer.write_u8!??(x u8)",
"io_writer.write_u16be!??(x u16)",
"io_writer.write_u16le!??(x u16)",
"io_writer.write_u24be!??(x u32[..0xFFFFFF])",
"io_writer.write_u24le!??(x u32[..0xFFFFFF])",
"io_writer.write_u32be!??(x u32)",
"io_writer.write_u32le!??(x u32)",
"io_writer.write_u40be!??(x u64[..0xFFFFFFFFFF])",
"io_writer.write_u40le!??(x u64[..0xFFFFFFFFFF])",
"io_writer.write_u48be!??(x u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u48le!??(x u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u56be!??(x u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u56le!??(x u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u64be!??(x u64)",
"io_writer.write_u64le!??(x u64)",
"io_writer.write_u8?(x u8)",
"io_writer.write_u16be?(x u16)",
"io_writer.write_u16le?(x u16)",
"io_writer.write_u24be?(x u32[..0xFFFFFF])",
"io_writer.write_u24le?(x u32[..0xFFFFFF])",
"io_writer.write_u32be?(x u32)",
"io_writer.write_u32le?(x u32)",
"io_writer.write_u40be?(x u64[..0xFFFFFFFFFF])",
"io_writer.write_u40le?(x u64[..0xFFFFFFFFFF])",
"io_writer.write_u48be?(x u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u48le?(x u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u56be?(x u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u56le?(x u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u64be?(x u64)",
"io_writer.write_u64le?(x u64)",
// TODO: these should have an explicit pre-condition "available() >= N".
// For now, that's implicitly checked (i.e. hard coded).
+7 -11
View File
@@ -1161,17 +1161,13 @@ func (p *parser) parseOperand() (*a.Expr, error) {
}
func (p *parser) parseEffect() a.Effect {
if p.peek1() != t.IDExclam {
return 0
}
p.src = p.src[1:]
if p.peek1() != t.IDQuestion {
switch p.peek1() {
case t.IDExclam:
p.src = p.src[1:]
return a.EffectImpure
case t.IDQuestion:
p.src = p.src[1:]
return a.EffectImpureCoroutine
}
p.src = p.src[1:]
if p.peek1() != t.IDQuestion {
panic("TODO: delete")
}
p.src = p.src[1:]
return a.EffectImpure | a.EffectCoroutine
return 0
}