cli/q
Code Issues 1 Pull Requests Activity

Simplified identifier lookup

Browse Source
This commit is contained in:
Eduard Urbach 2025-02-03 15:22:57 +01:00
parent 6af02d8fa3
commit 6959379182
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/Define.go
View File

@ -10,8 +10,9 @@ import (
// Define defines a new variable.
func (f *Function) Define(leaf *expression.Expression) (*scope.Variable, error) {
name := leaf.Token.Text(f.File.Bytes)
variable, _ := f.Identifier(name)
if f.IdentifierExists(name) {
if variable != nil {
return nil, errors.New(&errors.VariableAlreadyExists{Name: name}, f.File, leaf.Token.Position)
}
@ -21,7 +22,7 @@ func (f *Function) Define(leaf *expression.Expression) (*scope.Variable, error)
return nil, errors.New(&errors.UnusedVariable{Name: name}, f.File, leaf.Token.Position)
}
variable := &scope.Variable{
variable = &scope.Variable{
Name: name,
Register: f.NewRegister(),
Alive: uses,

11
src/core/ExpressionToMemory.go
View File

@ -1,8 +1,6 @@
package core
import (
"fmt"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/expression"
@ -16,7 +14,7 @@ func (f *Function) ExpressionToMemory(node *expression.Expression, memory asm.Me
if node.IsLeaf() {
if node.Token.Kind == token.Identifier {
name := node.Token.Text(f.File.Bytes)
variable := f.VariableByName(name)
variable, function := f.Identifier(name)
if variable != nil {
f.UseVariable(variable)
@ -24,11 +22,8 @@ func (f *Function) ExpressionToMemory(node *expression.Expression, memory asm.Me
return types.Pointer, nil
}
uniqueName := fmt.Sprintf("%s.%s", f.Package, name)
_, exists := f.Functions[uniqueName]
if exists {
f.MemoryLabel(asm.STORE, memory, uniqueName)
if function != nil {
f.MemoryLabel(asm.STORE, memory, function.UniqueName)
return types.Pointer, nil
}

25
src/core/Identifier.go Normal file
View File

@ -0,0 +1,25 @@
package core
import (
"fmt"
"git.akyoto.dev/cli/q/src/scope"
)
// Identifier looks up an identifier which can be a variable or a function.
func (f *Function) Identifier(name string) (*scope.Variable, *Function) {
variable := f.VariableByName(name)
if variable != nil {
return variable, nil
}
uniqueName := fmt.Sprintf("%s.%s", f.Package, name)
function, exists := f.Functions[uniqueName]
if exists {
return nil, function
}
return nil, nil
}

13
src/core/IdentifierExists.go
View File

@ -1,13 +0,0 @@
package core
// IdentifierExists returns true if the identifier has been defined.
func (f *Function) IdentifierExists(name string) bool {
variable := f.VariableByName(name)
if variable != nil {
return true
}
_, exists := f.Functions[name]
return exists
}

11
src/core/TokenToRegister.go
View File

@ -1,8 +1,6 @@
package core
import (
"fmt"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/cpu"
"git.akyoto.dev/cli/q/src/errors"
@ -16,7 +14,7 @@ func (f *Function) TokenToRegister(t token.Token, register cpu.Register) (*types
switch t.Kind {
case token.Identifier:
name := t.Text(f.File.Bytes)
variable := f.VariableByName(name)
variable, function := f.Identifier(name)
if variable != nil {
f.UseVariable(variable)
@ -25,12 +23,9 @@ func (f *Function) TokenToRegister(t token.Token, register cpu.Register) (*types
return variable.Type, nil
}
uniqueName := fmt.Sprintf("%s.%s", f.Package, name)
_, exists := f.Functions[uniqueName]
if exists {
if function != nil {
f.SaveRegister(register)
f.RegisterLabel(asm.MOVE, register, uniqueName)
f.RegisterLabel(asm.MOVE, register, function.UniqueName)
return types.Pointer, nil
}