Skip to content

addressed issue #230 ... #259

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.

Sign up for GitHub

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

Merged
lutzhamel merged 1 commit into from
Apr 12, 2023
Merged

addressed issue #230 ... #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions asteroid/test-suites/regression-tests/test135.ast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end

try
let B(x,y) = A(1,2).
catch Exception(t,m) do
assert(m is "'B' is not defined").
catch e:Exception(t,m) do
assert(m is "illegal pattern, 'B' is not a type").
end

17 changes: 13 additions & 4 deletions asteroid/walk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,13 @@ def __unify(term, pattern, unifying = True ):
(OBJECT,
(STRUCT_ID, (ID, struct_id)),
(OBJECT_MEMORY, (LIST, obj_memory))) = term
# unpack pattern
# only constructors are allowed in patterns
(APPLY,
(ID, apply_id),
arg) = pattern
type = state.symbol_table.lookup_sym(apply_id)
if type[0] != 'struct':
raise PatternMatchFailed("'{}' is not a type".format(apply_id))
type = state.symbol_table.lookup_sym(apply_id,strict=False)
if not type or type[0] != 'struct':
raise ValueError("illegal pattern, '{}' is not a type".format(apply_id))

if struct_id != apply_id:
raise PatternMatchFailed("expected type '{}' got type '{}'"
Expand Down Expand Up @@ -525,6 +525,15 @@ def __unify(term, pattern, unifying = True ):

# builtin operators look like apply lists with operator names
elif pattern[0] == 'apply':

# only constructors are allowed in patterns
(APPLY,
(ID, apply_id),
arg) = pattern
type = state.symbol_table.lookup_sym(apply_id,strict=False)
if not type or type[0] != 'struct':
raise ValueError("illegal pattern, function or operator '{}' not supported".format(apply_id))

if term[0] != pattern[0]: # make sure both are applys
raise PatternMatchFailed(
"term and pattern disagree on structure")
Expand Down