Remove obsolete C32/C64 code.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/ab5a44bd Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/ab5a44bd Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/ab5a44bd Branch: refs/heads/master Commit: ab5a44bd414e79ed0a5127e303887056ce09d7cd Parents: febd2ff Author: Marvin Humphrey <[email protected]> Authored: Wed Apr 20 19:23:29 2016 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Wed Apr 20 19:26:48 2016 -0700 ---------------------------------------------------------------------- core/Lucy/Store/InStream.c | 10 ---------- core/Lucy/Store/InStream.cfh | 11 ----------- core/Lucy/Store/OutStream.c | 10 ---------- core/Lucy/Store/OutStream.cfh | 10 ---------- go/build.go | 4 ---- go/lucy/store.go | 32 -------------------------------- 6 files changed, 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/core/Lucy/Store/InStream.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Store/InStream.c b/core/Lucy/Store/InStream.c index d04652d..ab78b0d 100644 --- a/core/Lucy/Store/InStream.c +++ b/core/Lucy/Store/InStream.c @@ -472,11 +472,6 @@ InStream_Read_F64_IMP(InStream *self) { return duo.d; } -uint32_t -InStream_Read_C32_IMP(InStream *self) { - return SI_read_cu32(self); -} - int32_t InStream_Read_CI32_IMP(InStream *self) { return (int32_t)SI_read_cu32(self); @@ -501,11 +496,6 @@ SI_read_cu32(InStream *self) { return retval; } -uint64_t -InStream_Read_C64_IMP(InStream *self) { - return SI_read_cu64(self); -} - int64_t InStream_Read_CI64_IMP(InStream *self) { return (int64_t)SI_read_cu64(self); http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/core/Lucy/Store/InStream.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Store/InStream.cfh b/core/Lucy/Store/InStream.cfh index 921be77..3d96860 100644 --- a/core/Lucy/Store/InStream.cfh +++ b/core/Lucy/Store/InStream.cfh @@ -171,11 +171,6 @@ class Lucy::Store::InStream inherits Clownfish::Obj { final double Read_F64(InStream *self); - /** Read in a compressed 32-bit unsigned integer. - */ - uint32_t - Read_C32(InStream *self); - /** Read in a compressed 32-bit signed integer. */ int32_t @@ -186,12 +181,6 @@ class Lucy::Store::InStream inherits Clownfish::Obj { uint32_t Read_CU32(InStream *self); - /** Read a 64-bit integer, using the same encoding as a C32 but occupying - * as many as 10 bytes. - */ - final uint64_t - Read_C64(InStream *self); - /** Read a 64-bit signed integer, using the same encoding as a CI32 but * occupying as many as 10 bytes. */ http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/core/Lucy/Store/OutStream.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Store/OutStream.c b/core/Lucy/Store/OutStream.c index 8ae07d4..7e619a4 100644 --- a/core/Lucy/Store/OutStream.c +++ b/core/Lucy/Store/OutStream.c @@ -290,11 +290,6 @@ OutStream_Write_F64_IMP(OutStream *self, double value) { } void -OutStream_Write_C32_IMP(OutStream *self, uint32_t value) { - SI_write_cu32(self, OutStream_IVARS(self), value); -} - -void OutStream_Write_CI32_IMP(OutStream *self, int32_t value) { SI_write_cu32(self, OutStream_IVARS(self), (uint32_t)value); } @@ -323,11 +318,6 @@ SI_write_cu32(OutStream *self, OutStreamIVARS *ivars, uint32_t value) { } void -OutStream_Write_C64_IMP(OutStream *self, uint64_t value) { - SI_write_cu64(self, OutStream_IVARS(self), value); -} - -void OutStream_Write_CI64_IMP(OutStream *self, int64_t value) { SI_write_cu64(self, OutStream_IVARS(self), (uint64_t)value); } http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/core/Lucy/Store/OutStream.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Store/OutStream.cfh b/core/Lucy/Store/OutStream.cfh index cb67003..391418d 100644 --- a/core/Lucy/Store/OutStream.cfh +++ b/core/Lucy/Store/OutStream.cfh @@ -113,11 +113,6 @@ class Lucy::Store::OutStream inherits Clownfish::Obj { final void Write_U64(OutStream *self, uint64_t value); - /** Write a 32-bit integer using a compressed format. - */ - final void - Write_C32(OutStream *self, uint32_t value); - /** Write a signed 32-bit integer using a compressed format. */ final void @@ -128,11 +123,6 @@ class Lucy::Store::OutStream inherits Clownfish::Obj { final void Write_CU32(OutStream *self, uint32_t value); - /** Write a 64-bit integer using a compressed format. - */ - final void - Write_C64(OutStream *self, uint64_t value); - /** Write a signed 64-bit integer using a compressed format. */ final void http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/go/build.go ---------------------------------------------------------------------- diff --git a/go/build.go b/go/build.go index ecf36f4..3fea7a0 100644 --- a/go/build.go +++ b/go/build.go @@ -387,10 +387,8 @@ func specClasses(parcel *cfc.Parcel) { inStreamBinding.SpecMethod("Read_U8", "ReadU8() (uint8, error)") inStreamBinding.SpecMethod("Read_U32", "ReadU32() (uint32, error)") inStreamBinding.SpecMethod("Read_U64", "ReadU64() (uint64, error)") - inStreamBinding.SpecMethod("Read_C32", "ReadC32() (uint32, error)") inStreamBinding.SpecMethod("Read_CI32", "ReadCI32() (int32, error)") inStreamBinding.SpecMethod("Read_CU32", "ReadCU32() (uint32, error)") - inStreamBinding.SpecMethod("Read_C64", "ReadC64() (uint64, error)") inStreamBinding.SpecMethod("Read_CI64", "ReadCI64() (int64, error)") inStreamBinding.SpecMethod("Read_CU64", "ReadCU64() (uint64, error)") inStreamBinding.SpecMethod("Read_F32", "ReadF32() (float32, error)") @@ -409,10 +407,8 @@ func specClasses(parcel *cfc.Parcel) { outStreamBinding.SpecMethod("Write_U8", "WriteU8(uint8) error") outStreamBinding.SpecMethod("Write_U32", "WriteU32(uint32) error") outStreamBinding.SpecMethod("Write_U64", "WriteU64(uint64) error") - outStreamBinding.SpecMethod("Write_C32", "WriteC32(uint32) error") outStreamBinding.SpecMethod("Write_CI32", "WriteCI32(int32) error") outStreamBinding.SpecMethod("Write_CU32", "WriteCU32(uint32) error") - outStreamBinding.SpecMethod("Write_C64", "WriteC64(uint64) error") outStreamBinding.SpecMethod("Write_CI64", "WriteCI64(int64) error") outStreamBinding.SpecMethod("Write_CU64", "WriteCU64(uint64) error") outStreamBinding.SpecMethod("Write_F32", "WriteF32(float32) error") http://git-wip-us.apache.org/repos/asf/lucy/blob/ab5a44bd/go/lucy/store.go ---------------------------------------------------------------------- diff --git a/go/lucy/store.go b/go/lucy/store.go index 0b11a2f..a543ece 100644 --- a/go/lucy/store.go +++ b/go/lucy/store.go @@ -171,15 +171,6 @@ func (in *InStreamIMP) ReadU64() (uint64, error) { return retval, err } -func (in *InStreamIMP) ReadC32() (uint32, error) { - var retval uint32 - err := clownfish.TrapErr(func() { - self := (*C.lucy_InStream)(clownfish.Unwrap(in, "in")) - retval = uint32(C.LUCY_InStream_Read_C32(self)) - }) - return retval, err -} - func (in *InStreamIMP) ReadCI32() (int32, error) { var retval int32 err := clownfish.TrapErr(func() { @@ -198,15 +189,6 @@ func (in *InStreamIMP) ReadCU32() (uint32, error) { return retval, err } -func (in *InStreamIMP) ReadC64() (uint64, error) { - var retval uint64 - err := clownfish.TrapErr(func() { - self := (*C.lucy_InStream)(clownfish.Unwrap(in, "in")) - retval = uint64(C.LUCY_InStream_Read_C64(self)) - }) - return retval, err -} - func (in *InStreamIMP) ReadCI64() (int64, error) { var retval int64 err := clownfish.TrapErr(func() { @@ -343,13 +325,6 @@ func (out *OutStreamIMP) WriteU64(value uint64) error { }) } -func (out *OutStreamIMP) WriteC32(value uint32) error { - return clownfish.TrapErr(func() { - self := (*C.lucy_OutStream)(clownfish.Unwrap(out, "out")) - C.LUCY_OutStream_Write_C32(self, C.uint32_t(value)) - }) -} - func (out *OutStreamIMP) WriteCI32(value int32) error { return clownfish.TrapErr(func() { self := (*C.lucy_OutStream)(clownfish.Unwrap(out, "out")) @@ -364,13 +339,6 @@ func (out *OutStreamIMP) WriteCU32(value uint32) error { }) } -func (out *OutStreamIMP) WriteC64(value uint64) error { - return clownfish.TrapErr(func() { - self := (*C.lucy_OutStream)(clownfish.Unwrap(out, "out")) - C.LUCY_OutStream_Write_C64(self, C.uint64_t(value)) - }) -} - func (out *OutStreamIMP) WriteCI64(value int64) error { return clownfish.TrapErr(func() { self := (*C.lucy_OutStream)(clownfish.Unwrap(out, "out"))
