Implemented reading from struct fields
This commit is contained in:
parent
03a3bd8f02
commit
bde68d4d64
@ -1,3 +1,6 @@
|
|||||||
|
import mem
|
||||||
|
import sys
|
||||||
|
|
||||||
struct Point {
|
struct Point {
|
||||||
x Int
|
x Int
|
||||||
y Int
|
y Int
|
||||||
@ -5,7 +8,20 @@ struct Point {
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
p := new(Point)
|
p := new(Point)
|
||||||
p.x = 4
|
p.x = 1
|
||||||
p.y = 2
|
p.y = 2
|
||||||
|
|
||||||
|
out := mem.alloc(8)
|
||||||
|
out[0] = 'x'
|
||||||
|
out[1] = ' '
|
||||||
|
out[2] = '0' + p.x
|
||||||
|
out[3] = '\n'
|
||||||
|
out[4] = 'y'
|
||||||
|
out[5] = ' '
|
||||||
|
out[6] = '0' + p.y
|
||||||
|
out[7] = '\n'
|
||||||
|
sys.write(1, out, 8)
|
||||||
|
mem.free(out)
|
||||||
|
|
||||||
delete(p)
|
delete(p)
|
||||||
}
|
}
|
@ -24,9 +24,12 @@ func (f *Function) CompileAssignField(node *ast.Assign) error {
|
|||||||
defer f.UseVariable(variable)
|
defer f.UseVariable(variable)
|
||||||
pointer := variable.Type.(*types.Pointer)
|
pointer := variable.Type.(*types.Pointer)
|
||||||
structure := pointer.To.(*types.Struct)
|
structure := pointer.To.(*types.Struct)
|
||||||
|
field := structure.FieldByName(fieldName)
|
||||||
|
|
||||||
|
if field == nil {
|
||||||
|
return errors.New(&errors.UnknownStructField{StructName: structure.Name, FieldName: fieldName}, f.File, destination.Children[1].Token.Position)
|
||||||
|
}
|
||||||
|
|
||||||
for _, field := range structure.Fields {
|
|
||||||
if field.Name == fieldName {
|
|
||||||
memory := asm.Memory{
|
memory := asm.Memory{
|
||||||
Base: variable.Register,
|
Base: variable.Register,
|
||||||
Offset: field.Offset,
|
Offset: field.Offset,
|
||||||
@ -37,8 +40,3 @@ func (f *Function) CompileAssignField(node *ast.Assign) error {
|
|||||||
_, err := f.ExpressionToMemory(value, memory)
|
_, err := f.ExpressionToMemory(value, memory)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: unknown field error
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
@ -44,6 +44,17 @@ func (f *Function) ExpressionToRegister(node *expression.Expression, register cp
|
|||||||
return types.Int, err
|
return types.Int, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if node.Token.Kind == token.Period {
|
||||||
|
left := node.Children[0]
|
||||||
|
name := left.Token.Text(f.File.Bytes)
|
||||||
|
variable := f.VariableByName(name)
|
||||||
|
right := node.Children[1]
|
||||||
|
name = right.Token.Text(f.File.Bytes)
|
||||||
|
field := variable.Type.(*types.Pointer).To.(*types.Struct).FieldByName(name)
|
||||||
|
f.MemoryRegister(asm.LOAD, asm.Memory{Base: variable.Register, Offset: field.Offset, Length: field.Type.TotalSize()}, register)
|
||||||
|
return field.Type, nil
|
||||||
|
}
|
||||||
|
|
||||||
if len(node.Children) == 1 {
|
if len(node.Children) == 1 {
|
||||||
if !node.Token.IsUnaryOperator() {
|
if !node.Token.IsUnaryOperator() {
|
||||||
return nil, errors.New(errors.MissingOperand, f.File, node.Token.End())
|
return nil, errors.New(errors.MissingOperand, f.File, node.Token.End())
|
||||||
|
19
src/errors/UnknownStructField.go
Normal file
19
src/errors/UnknownStructField.go
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
package errors
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// UnknownStructField represents unknown struct fields.
|
||||||
|
type UnknownStructField struct {
|
||||||
|
StructName string
|
||||||
|
FieldName string
|
||||||
|
CorrectFieldName string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error generates the string representation.
|
||||||
|
func (err *UnknownStructField) Error() string {
|
||||||
|
if err.CorrectFieldName != "" {
|
||||||
|
return fmt.Sprintf("Unknown struct field '%s' in '%s', did you mean '%s'?", err.FieldName, err.StructName, err.CorrectFieldName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf("Unknown struct field '%s' in '%s'", err.FieldName, err.StructName)
|
||||||
|
}
|
@ -14,3 +14,13 @@ func (s *Struct) UniqueName() string {
|
|||||||
func (s *Struct) TotalSize() uint8 {
|
func (s *Struct) TotalSize() uint8 {
|
||||||
return s.Size
|
return s.Size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Struct) FieldByName(name string) *Field {
|
||||||
|
for _, field := range s.Fields {
|
||||||
|
if field.Name == name {
|
||||||
|
return field
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
6
tests/errors/UnknownStructField.q
Normal file
6
tests/errors/UnknownStructField.q
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
struct A {}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
a := new(A)
|
||||||
|
a.x = 1
|
||||||
|
}
|
@ -48,6 +48,7 @@ var errs = []struct {
|
|||||||
{"UnknownIdentifier2.q", &errors.UnknownIdentifier{Name: "x"}},
|
{"UnknownIdentifier2.q", &errors.UnknownIdentifier{Name: "x"}},
|
||||||
{"UnknownIdentifier3.q", &errors.UnknownIdentifier{Name: "x"}},
|
{"UnknownIdentifier3.q", &errors.UnknownIdentifier{Name: "x"}},
|
||||||
{"UnknownPackage.q", &errors.UnknownPackage{Name: "sys"}},
|
{"UnknownPackage.q", &errors.UnknownPackage{Name: "sys"}},
|
||||||
|
{"UnknownStructField.q", &errors.UnknownStructField{StructName: "A", FieldName: "x"}},
|
||||||
{"UnusedImport.q", &errors.UnusedImport{Package: "sys"}},
|
{"UnusedImport.q", &errors.UnusedImport{Package: "sys"}},
|
||||||
{"UnusedVariable.q", &errors.UnusedVariable{Name: "x"}},
|
{"UnusedVariable.q", &errors.UnusedVariable{Name: "x"}},
|
||||||
{"VariableAlreadyExists.q", &errors.VariableAlreadyExists{Name: "x"}},
|
{"VariableAlreadyExists.q", &errors.VariableAlreadyExists{Name: "x"}},
|
||||||
|
@ -24,6 +24,7 @@ var examples = []struct {
|
|||||||
{"itoa", "", "9223372036854775807", 0},
|
{"itoa", "", "9223372036854775807", 0},
|
||||||
{"collatz", "", "6 3 10 5 16 8 4 2 1", 0},
|
{"collatz", "", "6 3 10 5 16 8 4 2 1", 0},
|
||||||
{"fizzbuzz", "", "1 2 Fizz 4 Buzz Fizz 7 8 Fizz Buzz 11 Fizz 13 14 FizzBuzz", 0},
|
{"fizzbuzz", "", "1 2 Fizz 4 Buzz Fizz 7 8 Fizz Buzz 11 Fizz 13 14 FizzBuzz", 0},
|
||||||
|
{"point", "", "x 1\ny 2\n", 0},
|
||||||
{"prime", "", "2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97", 0},
|
{"prime", "", "2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97", 0},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
34
tests/programs/struct.q
Normal file
34
tests/programs/struct.q
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
struct Point {
|
||||||
|
x Int
|
||||||
|
y Int
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
p := new(Point)
|
||||||
|
assert p.x == 0
|
||||||
|
assert p.y == 0
|
||||||
|
assert p.x == p.y
|
||||||
|
|
||||||
|
p.x = 1
|
||||||
|
p.y = 2
|
||||||
|
assert p.x == 1
|
||||||
|
assert p.y == 2
|
||||||
|
assert p.x != p.y
|
||||||
|
|
||||||
|
p.x = p.y
|
||||||
|
assert p.x == 2
|
||||||
|
assert p.y == 2
|
||||||
|
assert p.x == p.y
|
||||||
|
|
||||||
|
p.x = p.y + 1
|
||||||
|
assert p.x == 3
|
||||||
|
assert p.y == 2
|
||||||
|
assert p.x != p.y
|
||||||
|
|
||||||
|
p.y = p.x
|
||||||
|
assert p.x == 3
|
||||||
|
assert p.y == 3
|
||||||
|
assert p.x == p.y
|
||||||
|
|
||||||
|
delete(p)
|
||||||
|
}
|
@ -60,6 +60,7 @@ var programs = []struct {
|
|||||||
{"loop", "", "", 0},
|
{"loop", "", "", 0},
|
||||||
{"loop-lifetime", "", "", 0},
|
{"loop-lifetime", "", "", 0},
|
||||||
{"out-of-memory", "", "", 0},
|
{"out-of-memory", "", "", 0},
|
||||||
|
{"struct", "", "", 0},
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPrograms(t *testing.T) {
|
func TestPrograms(t *testing.T) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user