Get rid of generics

Author: RohitAwate

compiler/codegen/generator.go

@@ -16,11 +16,11 @@ package codegen
 
 import (
 	"fmt"
-	"github.com/RohitAwate/commaql/compiler/common"
-
 	"github.com/RohitAwate/commaql/compiler/ast"
+	"github.com/RohitAwate/commaql/compiler/common"
 	"github.com/RohitAwate/commaql/compiler/parser/tokenizer"
 	"github.com/RohitAwate/commaql/vm"
+	"github.com/RohitAwate/commaql/vm/values"
 )
 
 type CodeGenerator struct {
@@ -53,7 +53,7 @@ func (cg *CodeGenerator) Run() common.PhaseStatus {
 
 func (cg *CodeGenerator) visitSelectStmt(ss *ast.SelectStmt) {
 	for _, tableNode := range ss.Tables {
-		val := vm.String{Meta: tableNode.TableToken.Lexeme}
+		val := values.String{Meta: tableNode.TableToken.Lexeme}
 		loc := cg.Code.AddConstant(val)
 
 		cg.Code.EmitWithArg(vm.OpLoadConst, loc)
@@ -96,17 +96,17 @@ func (cg *CodeGenerator) visitLiteral(lit *ast.Literal) {
 	switch lit.Meta.Type {
 	case tokenizer.NUMBER:
 		// TODO: Write a helper for this, lots of duplication between these cases
-		val := vm.NewNumber(lit.Meta.Lexeme)
+		val := values.NewNumber(lit.Meta.Lexeme)
 		loc := cg.Code.AddConstant(val)
 		cg.Code.EmitWithArg(vm.OpLoadConst, loc)
 	case tokenizer.TRUE:
 		fallthrough
 	case tokenizer.FALSE:
-		val := vm.NewBoolean(lit.Meta.Type)
+		val := values.NewBoolean(lit.Meta.Type)
 		loc := cg.Code.AddConstant(val)
 		cg.Code.EmitWithArg(vm.OpLoadConst, loc)
 	case tokenizer.STRING:
-		val := vm.NewString(lit.Meta.Lexeme)
+		val := values.NewString(lit.Meta.Lexeme)
 		loc := cg.Code.AddConstant(val)
 		cg.Code.EmitWithArg(vm.OpLoadConst, loc)
 	default:

table/csv.go

@@ -2,20 +2,21 @@ package table
 
 import (
 	"encoding/csv"
+	"github.com/RohitAwate/commaql/vm/values"
 	"os"
 	"strings"
 )
 
-type CSVTable[T SQLType] struct {
+type CSVTable struct {
 	name    string
-	columns []Column[T]
+	columns []Column
 	reader  *csv.Reader
 }
 
-func NewCSVTable[T SQLType](file *os.File) (*CSVTable[T], error) {
-	table := CSVTable[T]{
+func NewCSVTable(file *os.File) (*CSVTable, error) {
+	table := CSVTable{
 		reader: csv.NewReader(file), name: file.Name(),
-		columns: []Column[T]{},
+		columns: []Column{},
 	}
 
 	// Scan the first row of the CSVs.
@@ -51,17 +52,8 @@ func NewCSVTable[T SQLType](file *os.File) (*CSVTable[T], error) {
 			columnName = getColumnAlias(uint(index))
 		}
 
-		switch deduceTypeForColumn(dataValue) {
-		case SqlInt:
-			newColumn := Column[int]{Name: columnName}
-			table.columns = append(table.columns, newColumn)
-		case SqlFloat:
-			newColumn := Column[float64]{Name: columnName}
-		case SqlBool:
-			newColumn := Column[bool]{Name: columnName}
-		default:
-			newColumn := Column[string]{Name: columnName}
-		}
+		newColumn := Column{Name: columnName, Type: deduceTypeForColumn(dataValue)}
+		table.columns = append(table.columns, newColumn)
 	}
 
 	return &table, nil
@@ -71,14 +63,18 @@ func (ct CSVTable) Name() string {
 	return ct.name
 }
 
-func (ct CSVTable) Columns() []Column[T] {
+func (ct CSVTable) Columns() []Column {
 	return ct.columns
 }
 
 func (ct CSVTable) LoadData() {
 	// TODO
 }
 
+func (ct CSVTable) NextRow() ([]values.Value, error) {
+	return make([]values.Value, 10), nil
+}
+
 func (ct CSVTable) nextRow() ([]string, error) {
 	row, err := ct.reader.Read()
 	if err != nil {

table/storage.go

@@ -14,17 +14,16 @@
 
 package table
 
-type SQLType interface {
-	int | float64 | string | bool
-}
+import "github.com/RohitAwate/commaql/vm/values"
 
-type Column[T SQLType] struct {
+type Column struct {
 	Name string
-	Data Storage[T]
+	Type SQLTypeHint
 }
 
-type Table[T SQLType] interface {
+type Table interface {
 	Name() string
-	Columns() []Column[T]
+	Columns() []Column
 	LoadData()
+	NextRow() ([]values.Value, error)
 }

table/table.go

@@ -14,6 +14,8 @@
 
 package vm
 
+import "github.com/RohitAwate/commaql/vm/values"
+
 type OpCode uint
 
 const (
@@ -69,17 +71,17 @@ func GetOpCodeInfo(opCode OpCode) OpCodeInfo {
 
 type Bytecode struct {
 	Blob          []OpCode
-	ConstantsPool []Value
+	ConstantsPool []values.Value
 }
 
 func NewBytecode() Bytecode {
 	return Bytecode{
 		Blob:          []OpCode{},
-		ConstantsPool: []Value{},
+		ConstantsPool: []values.Value{},
 	}
 }
 
-func (b *Bytecode) AddConstant(v Value) uint {
+func (b *Bytecode) AddConstant(v values.Value) uint {
 	b.ConstantsPool = append(b.ConstantsPool, v)
 	return uint(len(b.ConstantsPool) - 1)
 }

vm/bytecode.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package vm
+package values
 
 import (
 	"fmt"