Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
mlmhl committed Aug 26, 2016
1 parent 85898b2 commit 678ebe6
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 20 deletions.
118 changes: 98 additions & 20 deletions gstac/compiler/ast/expression.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,35 +416,34 @@ type AddAssignExpression struct {
}

func (expression *AddAssignExpression) getOperatorCode(typ Type) byte {
// Add operation doesn't support 'null', so 'bool' is the start type.
return executable.GetOperatorCode(executable.ADD_BOOL, typ.GetOffset()-1)
return executable.GetOperatorCode(executable.ADD_BOOL, typ.GetOffset())
}

type SubtractAssignExpression struct {
baseAssignExpression
}

func (expression *SubtractExpression) getOperatorCode(typ Type) byte {
// Add operation doesn't support 'null' and 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.SUBTRACT_INT, typ.GetOffset()-2)
func (expression *SubtractAssignExpression) getOperatorCode(typ Type) byte {
// Add operation doesn't support 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.SUBTRACT_INT, typ.GetOffset()-1)
}

type MultiplyAssignExpression struct {
baseAssignExpression
}

func (expression *MultiplyAssignExpression) getOperatorCode(typ Type) byte {
// Add operation doesn't support 'null' and 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.MULTIPLY_INT, typ.GetOffset()-2)
// Add operation doesn't support 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.MULTIPLY_INT, typ.GetOffset()-1)
}

type DivideAssignExpression struct {
baseAssignExpression
}

func (expression *DivideAssignExpression) getOperatorCode(typ Type) byte {
// Add operation doesn't support 'null' and 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.DIVIDE_INT, typ.GetOffset()-2)
// Add operation doesn't support and 'bool', so 'int' is the start type.
return executable.GetOperatorCode(executable.DIVIDE_INT, typ.GetOffset()-1)
}

type ModAssignExpression struct {
Expand Down Expand Up @@ -606,10 +605,11 @@ func (expression *baseAssignExpression) getLocation() *common.Location {

type binaryExpression interface {
execute(left, right interface{}, location *common.Location) (Expression, errors.Error)
getOperatorCode(typ Type) byte
}

type baseBinaryExpression struct {
this binaryExpression
this Expression
left Expression
right Expression

Expand All @@ -631,7 +631,7 @@ func (expression *baseBinaryExpression) Fix(context *Context) (Expression, error
l, lok := expression.left.(valueExpression)
r, rok := expression.right.(valueExpression)
if lok && rok {
return expression.this.execute(l.getValue(), r.getValue(), expression.left.getLocation())
return expression.this.(binaryExpression).execute(l.getValue(), r.getValue(), expression.left.getLocation())
}

var leftType Type
Expand Down Expand Up @@ -671,6 +671,35 @@ func (expression *baseBinaryExpression) CastTo(destType Type, context *Context)
return typeCast(srcType, destType, expression)
}

func (expression *baseBinaryExpression) Generate(context *Context, exe *executable.Executable) ([]byte, errors.Error) {
buffer := []byte{}

var (
typ Type
code []byte
err errors.Error
)

if code, err = expression.left.Generate(context, exe); err != nil {
return nil, err
}
buffer = append(buffer, code...)

if code, err = expression.right.Generate(context, exe); err != nil {
return nil, err
}
buffer = append(buffer, code...)

// Generate the operator
if typ, err = expression.this.getType(context); err != nil {
return nil, err
} else {
buffer = append(buffer, expression.this.(binaryExpression).getOperatorCode(typ))
}

return buffer, nil
}

func (expression *baseBinaryExpression) getType(context *Context) (Type, errors.Error) {
leftType, err := expression.left.getType(context)
if err != nil {
Expand Down Expand Up @@ -785,6 +814,10 @@ func (expression *AddExpression) execute(left, right interface{},
}
}

func (expression *AddExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.ADD_BOOL, typ.GetOffset())
}

type SubtractExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -833,6 +866,11 @@ func (expression *SubtractExpression) execute(left, right interface{},
}
}

func (expression *SubtractExpression) getOperatorCode(typ Type) byte {
// For subtract operator, Int is the start type
return executable.GetOperatorCode(executable.SUBTRACT_INT, typ.GetOffset()-1)
}

type MultiplyExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -881,6 +919,10 @@ func (expression *MultiplyExpression) execute(left, right interface{},
}
}

func (expression *MultiplyExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.MULTIPLY_INT, typ.GetOffset()-1)
}

type DivideExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -928,6 +970,10 @@ func (expression *DivideExpression) execute(left, right interface{},
}
}

func (expression *DivideExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.DIVIDE_INT, typ.GetOffset()-1)
}

type ModExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -964,6 +1010,10 @@ func (expression *ModExpression) execute(left, right interface{},
}
}

func (expression *ModExpression) getOperatorCode(typ Type) byte {
return executable.MOD_INT
}

type EqualExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1028,6 +1078,10 @@ func (expression *EqualExpression) execute(left, right interface{},
}
}

func (expression *EqualExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.EQUAL_BOOL, typ.GetOffset())
}

type NotEqualExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1092,6 +1146,10 @@ func (expression *NotEqualExpression) execute(left, right interface{},
}
}

func (expression *NotEqualExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.NOT_EQUAL_BOOL, typ.GetOffset())
}

type GreaterThanExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1139,12 +1197,16 @@ func (expression *GreaterThanExpression) execute(left, right interface{},
}
}

type GreaterThanAndEqualExpression struct {
func (expression *GreaterThanExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.GREATER_THAN_INT, typ.GetOffset()-1)
}

type GreaterThanOrEqualExpression struct {
baseBinaryExpression
}

func NewGreaterThanAndEqualExpression(left, right Expression) *GreaterThanAndEqualExpression {
expression := &GreaterThanAndEqualExpression{
func NewGreaterThanAndEqualExpression(left, right Expression) *GreaterThanOrEqualExpression {
expression := &GreaterThanOrEqualExpression{
baseBinaryExpression: baseBinaryExpression{
left: left,
right: right,
Expand All @@ -1154,7 +1216,7 @@ func NewGreaterThanAndEqualExpression(left, right Expression) *GreaterThanAndEqu
return expression
}

func (expression *GreaterThanAndEqualExpression) execute(left, right interface{},
func (expression *GreaterThanOrEqualExpression) execute(left, right interface{},
location *common.Location) (Expression, errors.Error) {
tag := "GRETER_THAN"

Expand Down Expand Up @@ -1186,6 +1248,10 @@ func (expression *GreaterThanAndEqualExpression) execute(left, right interface{}
}
}

func (expression *GreaterThanOrEqualExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.GREATER_THAN_OR_EQUAL_INT, typ.GetOffset()-1)
}

type LessThanExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1234,12 +1300,16 @@ func (expression *LessThanExpression) execute(left, right interface{},
}
}

type LessThanAndEqualExpression struct {
func (expression *LessThanExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.LESS_THAN_INT, typ.GetOffset()-1)
}

type LessThanOrEqualExpression struct {
baseBinaryExpression
}

func NewLessThanAndEqualExpression(left, right Expression) *LessThanAndEqualExpression {
expression := &LessThanAndEqualExpression{
func NewLessThanAndEqualExpression(left, right Expression) *LessThanOrEqualExpression {
expression := &LessThanOrEqualExpression{
baseBinaryExpression: baseBinaryExpression{
left: left,
right: right,
Expand All @@ -1249,7 +1319,7 @@ func NewLessThanAndEqualExpression(left, right Expression) *LessThanAndEqualExpr
return expression
}

func (expression *LessThanAndEqualExpression) execute(left, right interface{},
func (expression *LessThanOrEqualExpression) execute(left, right interface{},
location *common.Location) (Expression, errors.Error) {
tag := "LESS_THAN"

Expand Down Expand Up @@ -1282,6 +1352,10 @@ func (expression *LessThanAndEqualExpression) execute(left, right interface{},
}
}

func (expression *LessThanOrEqualExpression) getOperatorCode(typ Type) byte {
return executable.GetOperatorCode(executable.LESS_THAN_OR_EQUAL_INT, typ.GetOffset()-1)
}

type LogicalOrExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1310,6 +1384,10 @@ func (expression *LogicalOrExpression) execute(left, right interface{},
}
}

func (expression *LogicalOrExpression) Generate(context *Context, exe *executable.Executable) ([]byte, errors.Error) {

}

type LogicalAndExpression struct {
baseBinaryExpression
}
Expand Down Expand Up @@ -1938,7 +2016,7 @@ func popToIdentifier(expression *IdentifierExpression, context *Context,
start = executable.POP_STACK_BOOL
}
// Int is the first supported type for pop stack operation
return []byte{append(executable.GetOperatorCode(start, typ.GetOffset()-2))}
return []byte{append(executable.GetOperatorCode(start, typ.GetOffset()-1))}
}

// Pop stack top value into array index
Expand Down
11 changes: 11 additions & 0 deletions gstac/compiler/ast/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ var (
type Type interface {
GetName() string
GetBaseType() Type

// 0: bool
// 1: float
// 2: float
// 3: object(string, array)
// 4 : null
GetOffset() int

Equal(other Type) bool
IsDeriveType() bool

Expand Down Expand Up @@ -120,6 +127,10 @@ func (typ *nullType) GetBaseType() Type {
return typ
}

func(typ *nullType) GetOffset() int {
return 4
}

func (typ *nullType) isPriorityOf(other Type) bool {
return other.isPriorityOfNull()
}
Expand Down
30 changes: 30 additions & 0 deletions gstac/executable/code.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,36 @@ const (
// Mod operator
MOD_INT

// Equal operator
EQUAL_BOOL
EQUAL_INT
EQUAL_FLOAT
EQUAL_STRING
EQUAL_NULL

//Unequal operator
NOT_EQUAL_BOOL
NOT_EQUAL_INT
NOT_EQUAL_FLOAT
NOT_EQUAL_STRING
NOT_EQUAL_NULL

// Greater than operator
GREATER_THAN_INT
GREATER_THAN_FLOAT

// Greater than and equal operator
GREATER_THAN_OR_EQUAL_INT
GREATER_THAN_OR_EQUAL_FLOAT

// Less than operator
LESS_THAN_INT
LESS_THAN_FLOAT

// Less than or equal operator
LESS_THAN_OR_EQUAL_INT
LESS_THAN_OR_EQUAL_FLOAT

// Support for continuous assignment like 'a=b=c'
STACK_TOP_DUPLICATE

Expand Down

0 comments on commit 678ebe6

Please sign in to comment.