Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add builtin function enum2int #682

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions builtins/builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,25 @@ func Int2Enum(args ...runtime.Object) runtime.Object {
return nil
}

func Enum2Int(args ...runtime.Object) runtime.Object {
e, ok := args[0].(*runtime.EnumValue)
if !ok {
return runtime.Errorf("Argument must be an enum value")
}

ranges, err := e.ReturnIdByValue()
if err != nil {
return runtime.Errorf("Can't find ID of provided value")
}
smallestId := 0
for i, enumRange := range ranges {
if enumRange.First < smallestId || i == 0 {
smallestId = enumRange.First
}
}
return runtime.NewInt(smallestId)
}

func Log(args ...runtime.Object) runtime.Object {
var ss []string
for _, arg := range args {
Expand Down Expand Up @@ -154,6 +173,7 @@ func init() {
"int2bit(in integer i, in integer l) return bitstring": Int2Bit,
"int2char(in integer i) return charstring": Int2Char,
"int2enum(in integer i, out any e)": Int2Enum,
"enum2int(in any e) return integer": Enum2Int,
"int2float(in integer i) return float": Int2Float,
"int2str(in integer i) return charstring": Int2Str,
"str2int(in charstring s) return integer": Str2Int,
Expand Down
4 changes: 4 additions & 0 deletions interpreter/interpreter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ func TestBuiltinFunctions(t *testing.T) {
{`type enumerated E1 {red, green, blue}; var E1 testVar := blue; int2enum(0, "wrong")`, runtime.Errorf("second argument must be an enum value")},
{`type enumerated E1 {red, green, blue}; var E1 testVar := blue; int2enum(4, testVar)`, runtime.Errorf("id 4 does not exist in any ranges of Enum E1")},

{`type enumerated E1 {red, green, blue}; var E1 testVar := blue; enum2int(testVar);`, `2`},
{`type enumerated E1 {red, green, blue}; var E1 testVar := blue; enum2int("wrong")`, runtime.Errorf("Argument must be an enum value")},
{`type enumerated E1 {red(10..20), green, blue}; var E1 testVar := red; enum2int(testVar);`, `10`},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enumerated values in TTCN-3 do not only have a name, but also a value (in that sense they are more similar to Rust, than C++):

Suggested change
{`type enumerated E1 {red(10..20), green, blue}; var E1 testVar := red; enum2int(testVar);`, `10`},
{`type enumerated E1 {red(10..20), green, blue}; var E1 testVar := red(15); enum2int(testVar);`, `15`},


{`int2unichar(-1)`, runtime.Errorf("Argument is out of range. Range is from 0 to 2147483647. Int = -1")},
{`int2unichar(2147483648)`, runtime.Errorf("Argument is out of range. Range is from 0 to 2147483647. Int = 2147483648")},
{`int2unichar(9786)`, runtime.NewUniversalString("☺")},
Expand Down
8 changes: 8 additions & 0 deletions runtime/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,14 @@ func (ev *EnumValue) SetValueById(id int) *Error {
}
return Errorf("id %d does not exist in any ranges of Enum %s", id, ev.typeRef.Name)
}

func (ev *EnumValue) ReturnIdByValue() ([]EnumRange, *Error) {
ranges, ok := ev.typeRef.Elements[ev.key]
if !ok {
return []EnumRange{}, Errorf("%s does not exist in Enum %s", ev.key, ev.typeRef.Name)
}
return ranges, nil
}
func NewEnumValue(enumType *EnumType, key string) (*EnumValue, error) {
if _, ok := enumType.Elements[key]; !ok {
return nil, fmt.Errorf("%s does not exist in Enum %s", key, enumType.Name)
Expand Down