codecgen: export c and m variables so they can be used by generated code

Fixes #226

codec/gen-helper.generated.go

@@ -57,7 +57,7 @@ func (x genHelperEncDriver) EncodeSymbol(s string) {
 
 type genHelperDecDriver struct {
 	decDriver
-	c checkOverflow
+	C checkOverflow
 }
 
 func (x genHelperDecDriver) DecodeBuiltin(rt uintptr, v interface{}) {}
@@ -65,10 +65,10 @@ func (x genHelperDecDriver) DecStructFieldKey(keyType valueType, buf *[scratchBy
 	return decStructFieldKey(x.decDriver, keyType, buf)
 }
 func (x genHelperDecDriver) DecodeInt(bitsize uint8) (i int64) {
-	return x.c.IntV(x.decDriver.DecodeInt64(), bitsize)
+	return x.C.IntV(x.decDriver.DecodeInt64(), bitsize)
 }
 func (x genHelperDecDriver) DecodeUint(bitsize uint8) (ui uint64) {
-	return x.c.UintV(x.decDriver.DecodeUint64(), bitsize)
+	return x.C.UintV(x.decDriver.DecodeUint64(), bitsize)
 }
 func (x genHelperDecDriver) DecodeFloat(chkOverflow32 bool) (f float64) {
 	f = x.DecodeFloat64()
@@ -87,14 +87,14 @@ func (x genHelperDecDriver) DecodeFloat32As64() (f float64) {
 
 // FOR USE BY CODECGEN ONLY. IT *WILL* CHANGE WITHOUT NOTICE. *DO NOT USE*
 type genHelperEncoder struct {
-	m must
+	M must
 	e *Encoder
 	F fastpathT
 }
 
 // FOR USE BY CODECGEN ONLY. IT *WILL* CHANGE WITHOUT NOTICE. *DO NOT USE*
 type genHelperDecoder struct {
-	c checkOverflow
+	C checkOverflow
 	d *Decoder
 	F fastpathT
 }

codec/gen-helper.go.tmpl

@@ -57,7 +57,7 @@ func (x genHelperEncDriver) EncodeSymbol(s string) {
 
 type genHelperDecDriver struct {
 	decDriver
-	c checkOverflow
+	C checkOverflow
 }
 
 func (x genHelperDecDriver) DecodeBuiltin(rt uintptr, v interface{}) {}
@@ -65,10 +65,10 @@ func (x genHelperDecDriver) DecStructFieldKey(keyType valueType, buf *[scratchBy
 	return decStructFieldKey(x.decDriver, keyType, buf)
 }
 func (x genHelperDecDriver) DecodeInt(bitsize uint8) (i int64) {
-	return x.c.IntV(x.decDriver.DecodeInt64(), bitsize)
+	return x.C.IntV(x.decDriver.DecodeInt64(), bitsize)
 }
 func (x genHelperDecDriver) DecodeUint(bitsize uint8) (ui uint64) {
-	return x.c.UintV(x.decDriver.DecodeUint64(), bitsize)
+	return x.C.UintV(x.decDriver.DecodeUint64(), bitsize)
 }
 func (x genHelperDecDriver) DecodeFloat(chkOverflow32 bool) (f float64) {
 	f = x.DecodeFloat64()
@@ -87,14 +87,14 @@ func (x genHelperDecDriver) DecodeFloat32As64() (f float64) {
 
 // FOR USE BY CODECGEN ONLY. IT *WILL* CHANGE WITHOUT NOTICE. *DO NOT USE*
 type genHelperEncoder struct {
-	m must
+	M must
 	e *Encoder
 	F fastpathT 
 }
 
 // FOR USE BY CODECGEN ONLY. IT *WILL* CHANGE WITHOUT NOTICE. *DO NOT USE*
 type genHelperDecoder struct {
-	c checkOverflow
+	C checkOverflow
 	d *Decoder
 	F fastpathT 
 }

codec/gen.go

@@ -1051,11 +1051,11 @@ func (x *genRunner) encStruct(varname string, rtid uintptr, t reflect.Type) {
 		// emulate EncStructFieldKey
 		switch ti.keyType {
 		case valueTypeInt:
-			x.linef("r.EncodeInt(z.m.Int(strconv.ParseInt(`%s`, 10, 64)))", si.encName)
+			x.linef("r.EncodeInt(z.M.Int(strconv.ParseInt(`%s`, 10, 64)))", si.encName)
 		case valueTypeUint:
-			x.linef("r.EncodeUint(z.m.Uint(strconv.ParseUint(`%s`, 10, 64)))", si.encName)
+			x.linef("r.EncodeUint(z.M.Uint(strconv.ParseUint(`%s`, 10, 64)))", si.encName)
 		case valueTypeFloat:
-			x.linef("r.EncodeFloat64(z.m.Float(strconv.ParseFloat(`%s`, 64)))", si.encName)
+			x.linef("r.EncodeFloat64(z.M.Float(strconv.ParseFloat(`%s`, 64)))", si.encName)
 		default: // string
 			x.linef("r.EncodeString(codecSelferCcUTF8%s, `%s`)", x.xs, si.encName)
 		}
@@ -1281,38 +1281,38 @@ func (x *genRunner) dec(varname string, t reflect.Type) {
 	// Since these are pointers, we cannot share, and have to use them one by one
 	switch t.Kind() {
 	case reflect.Int:
-		x.line("*((*int)(" + varname + ")) = int(z.c.IntV(r.DecodeInt64(), codecSelferBitsize" + x.xs + "))")
+		x.line("*((*int)(" + varname + ")) = int(z.C.IntV(r.DecodeInt64(), codecSelferBitsize" + x.xs + "))")
 		// x.line("z.DecInt((*int)(" + varname + "))")
 	case reflect.Int8:
-		x.line("*((*int8)(" + varname + ")) = int8(z.c.IntV(r.DecodeInt64(), 8))")
+		x.line("*((*int8)(" + varname + ")) = int8(z.C.IntV(r.DecodeInt64(), 8))")
 		// x.line("z.DecInt8((*int8)(" + varname + "))")
 	case reflect.Int16:
-		x.line("*((*int16)(" + varname + ")) = int16(z.c.IntV(r.DecodeInt64(), 16))")
+		x.line("*((*int16)(" + varname + ")) = int16(z.C.IntV(r.DecodeInt64(), 16))")
 		// x.line("z.DecInt16((*int16)(" + varname + "))")
 	case reflect.Int32:
-		x.line("*((*int32)(" + varname + ")) = int32(z.c.IntV(r.DecodeInt64(), 32))")
+		x.line("*((*int32)(" + varname + ")) = int32(z.C.IntV(r.DecodeInt64(), 32))")
 		// x.line("z.DecInt32((*int32)(" + varname + "))")
 	case reflect.Int64:
 		x.line("*((*int64)(" + varname + ")) = int64(r.DecodeInt64())")
 		// x.line("z.DecInt64((*int64)(" + varname + "))")
 
 	case reflect.Uint:
-		x.line("*((*uint)(" + varname + ")) = uint(z.c.UintV(r.DecodeUint64(), codecSelferBitsize" + x.xs + "))")
+		x.line("*((*uint)(" + varname + ")) = uint(z.C.UintV(r.DecodeUint64(), codecSelferBitsize" + x.xs + "))")
 		// x.line("z.DecUint((*uint)(" + varname + "))")
 	case reflect.Uint8:
-		x.line("*((*uint8)(" + varname + ")) = uint8(z.c.UintV(r.DecodeUint64(), 8))")
+		x.line("*((*uint8)(" + varname + ")) = uint8(z.C.UintV(r.DecodeUint64(), 8))")
 		// x.line("z.DecUint8((*uint8)(" + varname + "))")
 	case reflect.Uint16:
-		x.line("*((*uint16)(" + varname + ")) = uint16(z.c.UintV(r.DecodeUint64(), 16))")
+		x.line("*((*uint16)(" + varname + ")) = uint16(z.C.UintV(r.DecodeUint64(), 16))")
 		//x.line("z.DecUint16((*uint16)(" + varname + "))")
 	case reflect.Uint32:
-		x.line("*((*uint32)(" + varname + ")) = uint32(z.c.UintV(r.DecodeUint64(), 32))")
+		x.line("*((*uint32)(" + varname + ")) = uint32(z.C.UintV(r.DecodeUint64(), 32))")
 		//x.line("z.DecUint32((*uint32)(" + varname + "))")
 	case reflect.Uint64:
 		x.line("*((*uint64)(" + varname + ")) = uint64(r.DecodeUint64())")
 		//x.line("z.DecUint64((*uint64)(" + varname + "))")
 	case reflect.Uintptr:
-		x.line("*((*uintptr)(" + varname + ")) = uintptr(z.c.UintV(r.DecodeUint64(), codecSelferBitsize" + x.xs + "))")
+		x.line("*((*uintptr)(" + varname + ")) = uintptr(z.C.UintV(r.DecodeUint64(), codecSelferBitsize" + x.xs + "))")
 
 	case reflect.Float32:
 		x.line("*((*float32)(" + varname + ")) = float32(r.DecodeFloat32As64())")
@@ -1384,28 +1384,28 @@ func (x *genRunner) decTryAssignPrimitive(varname string, t reflect.Type) (tryAs
 
 	switch t.Kind() {
 	case reflect.Int:
-		x.linef("%s = z.c.IntV(r.DecodeInt64(), codecSelferBitsize%s)", varname, x.xs)
+		x.linef("%s = z.C.IntV(r.DecodeInt64(), codecSelferBitsize%s)", varname, x.xs)
 	case reflect.Int8:
-		x.linef("%s = z.c.IntV(r.DecodeInt64(), 8)", varname)
+		x.linef("%s = z.C.IntV(r.DecodeInt64(), 8)", varname)
 	case reflect.Int16:
-		x.linef("%s = z.c.IntV(r.DecodeInt64(), 16)", varname)
+		x.linef("%s = z.C.IntV(r.DecodeInt64(), 16)", varname)
 	case reflect.Int32:
-		x.linef("%s = z.c.IntV(r.DecodeInt64(), 32)", varname)
+		x.linef("%s = z.C.IntV(r.DecodeInt64(), 32)", varname)
 	case reflect.Int64:
 		x.linef("%s = r.DecodeInt64()", varname)
 
 	case reflect.Uint:
-		x.linef("%s = z.c.UintV(r.DecodeUint64(), codecSelferBitsize%s)", varname, x.xs)
+		x.linef("%s = z.C.UintV(r.DecodeUint64(), codecSelferBitsize%s)", varname, x.xs)
 	case reflect.Uint8:
-		x.linef("%s = z.c.UintV(r.DecodeUint64(), 8)", varname)
+		x.linef("%s = z.C.UintV(r.DecodeUint64(), 8)", varname)
 	case reflect.Uint16:
-		x.linef("%s = z.c.UintV(r.DecodeUint64(), 16)", varname)
+		x.linef("%s = z.C.UintV(r.DecodeUint64(), 16)", varname)
 	case reflect.Uint32:
-		x.linef("%s = z.c.UintV(r.DecodeUint64(), 32)", varname)
+		x.linef("%s = z.C.UintV(r.DecodeUint64(), 32)", varname)
 	case reflect.Uint64:
 		x.linef("%s = r.DecodeUint64()", varname)
 	case reflect.Uintptr:
-		x.linef("%s = z.c.UintV(r.DecodeUint64(), codecSelferBitsize%s)", varname, x.xs)
+		x.linef("%s = z.C.UintV(r.DecodeUint64(), codecSelferBitsize%s)", varname, x.xs)
 
 	case reflect.Float32:
 		x.linef("%s = r.DecodeFloat32As64()", varname)

codec/mammoth2_codecgen_generated_test.go

@@ -18255,7 +18255,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv20 := &x.FUint
 				if false {
 				} else {
-					*((*uint)(yyv20)) = uint(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+					*((*uint)(yyv20)) = uint(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 				}
 			}
 		case "FptrUint":
@@ -18272,7 +18272,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*uint)(x.FptrUint)) = uint(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+					*((*uint)(x.FptrUint)) = uint(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 				}
 			}
 		case "FUint8":
@@ -18282,7 +18282,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv24 := &x.FUint8
 				if false {
 				} else {
-					*((*uint8)(yyv24)) = uint8(z.c.UintV(r.DecodeUint64(), 8))
+					*((*uint8)(yyv24)) = uint8(z.C.UintV(r.DecodeUint64(), 8))
 				}
 			}
 		case "FptrUint8":
@@ -18299,7 +18299,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*uint8)(x.FptrUint8)) = uint8(z.c.UintV(r.DecodeUint64(), 8))
+					*((*uint8)(x.FptrUint8)) = uint8(z.C.UintV(r.DecodeUint64(), 8))
 				}
 			}
 		case "FUint16":
@@ -18309,7 +18309,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv28 := &x.FUint16
 				if false {
 				} else {
-					*((*uint16)(yyv28)) = uint16(z.c.UintV(r.DecodeUint64(), 16))
+					*((*uint16)(yyv28)) = uint16(z.C.UintV(r.DecodeUint64(), 16))
 				}
 			}
 		case "FptrUint16":
@@ -18326,7 +18326,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*uint16)(x.FptrUint16)) = uint16(z.c.UintV(r.DecodeUint64(), 16))
+					*((*uint16)(x.FptrUint16)) = uint16(z.C.UintV(r.DecodeUint64(), 16))
 				}
 			}
 		case "FUint32":
@@ -18336,7 +18336,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv32 := &x.FUint32
 				if false {
 				} else {
-					*((*uint32)(yyv32)) = uint32(z.c.UintV(r.DecodeUint64(), 32))
+					*((*uint32)(yyv32)) = uint32(z.C.UintV(r.DecodeUint64(), 32))
 				}
 			}
 		case "FptrUint32":
@@ -18353,7 +18353,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*uint32)(x.FptrUint32)) = uint32(z.c.UintV(r.DecodeUint64(), 32))
+					*((*uint32)(x.FptrUint32)) = uint32(z.C.UintV(r.DecodeUint64(), 32))
 				}
 			}
 		case "FUint64":
@@ -18390,7 +18390,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv40 := &x.FUintptr
 				if false {
 				} else {
-					*((*uintptr)(yyv40)) = uintptr(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+					*((*uintptr)(yyv40)) = uintptr(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 				}
 			}
 		case "FptrUintptr":
@@ -18407,7 +18407,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*uintptr)(x.FptrUintptr)) = uintptr(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+					*((*uintptr)(x.FptrUintptr)) = uintptr(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 				}
 			}
 		case "FInt":
@@ -18417,7 +18417,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv44 := &x.FInt
 				if false {
 				} else {
-					*((*int)(yyv44)) = int(z.c.IntV(r.DecodeInt64(), codecSelferBitsize19781))
+					*((*int)(yyv44)) = int(z.C.IntV(r.DecodeInt64(), codecSelferBitsize19781))
 				}
 			}
 		case "FptrInt":
@@ -18434,7 +18434,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*int)(x.FptrInt)) = int(z.c.IntV(r.DecodeInt64(), codecSelferBitsize19781))
+					*((*int)(x.FptrInt)) = int(z.C.IntV(r.DecodeInt64(), codecSelferBitsize19781))
 				}
 			}
 		case "FInt8":
@@ -18444,7 +18444,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv48 := &x.FInt8
 				if false {
 				} else {
-					*((*int8)(yyv48)) = int8(z.c.IntV(r.DecodeInt64(), 8))
+					*((*int8)(yyv48)) = int8(z.C.IntV(r.DecodeInt64(), 8))
 				}
 			}
 		case "FptrInt8":
@@ -18461,7 +18461,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*int8)(x.FptrInt8)) = int8(z.c.IntV(r.DecodeInt64(), 8))
+					*((*int8)(x.FptrInt8)) = int8(z.C.IntV(r.DecodeInt64(), 8))
 				}
 			}
 		case "FInt16":
@@ -18471,7 +18471,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv52 := &x.FInt16
 				if false {
 				} else {
-					*((*int16)(yyv52)) = int16(z.c.IntV(r.DecodeInt64(), 16))
+					*((*int16)(yyv52)) = int16(z.C.IntV(r.DecodeInt64(), 16))
 				}
 			}
 		case "FptrInt16":
@@ -18488,7 +18488,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*int16)(x.FptrInt16)) = int16(z.c.IntV(r.DecodeInt64(), 16))
+					*((*int16)(x.FptrInt16)) = int16(z.C.IntV(r.DecodeInt64(), 16))
 				}
 			}
 		case "FInt32":
@@ -18498,7 +18498,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				yyv56 := &x.FInt32
 				if false {
 				} else {
-					*((*int32)(yyv56)) = int32(z.c.IntV(r.DecodeInt64(), 32))
+					*((*int32)(yyv56)) = int32(z.C.IntV(r.DecodeInt64(), 32))
 				}
 			}
 		case "FptrInt32":
@@ -18515,7 +18515,7 @@ func (x *TestMammoth2) codecDecodeSelfFromMap(l int, d *Decoder) {
 				}
 				if false {
 				} else {
-					*((*int32)(x.FptrInt32)) = int32(z.c.IntV(r.DecodeInt64(), 32))
+					*((*int32)(x.FptrInt32)) = int32(z.C.IntV(r.DecodeInt64(), 32))
 				}
 			}
 		case "FInt64":
@@ -26135,7 +26135,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1173 := &x.FUint
 		if false {
 		} else {
-			*((*uint)(yyv1173)) = uint(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+			*((*uint)(yyv1173)) = uint(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 		}
 	}
 	if x.FptrUint == nil {
@@ -26162,7 +26162,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*uint)(x.FptrUint)) = uint(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+			*((*uint)(x.FptrUint)) = uint(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 		}
 	}
 	yyj1156++
@@ -26182,7 +26182,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1177 := &x.FUint8
 		if false {
 		} else {
-			*((*uint8)(yyv1177)) = uint8(z.c.UintV(r.DecodeUint64(), 8))
+			*((*uint8)(yyv1177)) = uint8(z.C.UintV(r.DecodeUint64(), 8))
 		}
 	}
 	if x.FptrUint8 == nil {
@@ -26209,7 +26209,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*uint8)(x.FptrUint8)) = uint8(z.c.UintV(r.DecodeUint64(), 8))
+			*((*uint8)(x.FptrUint8)) = uint8(z.C.UintV(r.DecodeUint64(), 8))
 		}
 	}
 	yyj1156++
@@ -26229,7 +26229,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1181 := &x.FUint16
 		if false {
 		} else {
-			*((*uint16)(yyv1181)) = uint16(z.c.UintV(r.DecodeUint64(), 16))
+			*((*uint16)(yyv1181)) = uint16(z.C.UintV(r.DecodeUint64(), 16))
 		}
 	}
 	if x.FptrUint16 == nil {
@@ -26256,7 +26256,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*uint16)(x.FptrUint16)) = uint16(z.c.UintV(r.DecodeUint64(), 16))
+			*((*uint16)(x.FptrUint16)) = uint16(z.C.UintV(r.DecodeUint64(), 16))
 		}
 	}
 	yyj1156++
@@ -26276,7 +26276,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1185 := &x.FUint32
 		if false {
 		} else {
-			*((*uint32)(yyv1185)) = uint32(z.c.UintV(r.DecodeUint64(), 32))
+			*((*uint32)(yyv1185)) = uint32(z.C.UintV(r.DecodeUint64(), 32))
 		}
 	}
 	if x.FptrUint32 == nil {
@@ -26303,7 +26303,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*uint32)(x.FptrUint32)) = uint32(z.c.UintV(r.DecodeUint64(), 32))
+			*((*uint32)(x.FptrUint32)) = uint32(z.C.UintV(r.DecodeUint64(), 32))
 		}
 	}
 	yyj1156++
@@ -26370,7 +26370,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1193 := &x.FUintptr
 		if false {
 		} else {
-			*((*uintptr)(yyv1193)) = uintptr(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+			*((*uintptr)(yyv1193)) = uintptr(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 		}
 	}
 	if x.FptrUintptr == nil {
@@ -26397,7 +26397,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*uintptr)(x.FptrUintptr)) = uintptr(z.c.UintV(r.DecodeUint64(), codecSelferBitsize19781))
+			*((*uintptr)(x.FptrUintptr)) = uintptr(z.C.UintV(r.DecodeUint64(), codecSelferBitsize19781))
 		}
 	}
 	yyj1156++
@@ -26417,7 +26417,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1197 := &x.FInt
 		if false {
 		} else {
-			*((*int)(yyv1197)) = int(z.c.IntV(r.DecodeInt64(), codecSelferBitsize19781))
+			*((*int)(yyv1197)) = int(z.C.IntV(r.DecodeInt64(), codecSelferBitsize19781))
 		}
 	}
 	if x.FptrInt == nil {
@@ -26444,7 +26444,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*int)(x.FptrInt)) = int(z.c.IntV(r.DecodeInt64(), codecSelferBitsize19781))
+			*((*int)(x.FptrInt)) = int(z.C.IntV(r.DecodeInt64(), codecSelferBitsize19781))
 		}
 	}
 	yyj1156++
@@ -26464,7 +26464,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1201 := &x.FInt8
 		if false {
 		} else {
-			*((*int8)(yyv1201)) = int8(z.c.IntV(r.DecodeInt64(), 8))
+			*((*int8)(yyv1201)) = int8(z.C.IntV(r.DecodeInt64(), 8))
 		}
 	}
 	if x.FptrInt8 == nil {
@@ -26491,7 +26491,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*int8)(x.FptrInt8)) = int8(z.c.IntV(r.DecodeInt64(), 8))
+			*((*int8)(x.FptrInt8)) = int8(z.C.IntV(r.DecodeInt64(), 8))
 		}
 	}
 	yyj1156++
@@ -26511,7 +26511,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1205 := &x.FInt16
 		if false {
 		} else {
-			*((*int16)(yyv1205)) = int16(z.c.IntV(r.DecodeInt64(), 16))
+			*((*int16)(yyv1205)) = int16(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
 	if x.FptrInt16 == nil {
@@ -26538,7 +26538,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*int16)(x.FptrInt16)) = int16(z.c.IntV(r.DecodeInt64(), 16))
+			*((*int16)(x.FptrInt16)) = int16(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
 	yyj1156++
@@ -26558,7 +26558,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		yyv1209 := &x.FInt32
 		if false {
 		} else {
-			*((*int32)(yyv1209)) = int32(z.c.IntV(r.DecodeInt64(), 32))
+			*((*int32)(yyv1209)) = int32(z.C.IntV(r.DecodeInt64(), 32))
 		}
 	}
 	if x.FptrInt32 == nil {
@@ -26585,7 +26585,7 @@ func (x *TestMammoth2) codecDecodeSelfFromArray(l int, d *Decoder) {
 		}
 		if false {
 		} else {
-			*((*int32)(x.FptrInt32)) = int32(z.c.IntV(r.DecodeInt64(), 32))
+			*((*int32)(x.FptrInt32)) = int32(z.C.IntV(r.DecodeInt64(), 32))
 		}
 	}
 	yyj1156++