From 24e996764b8d31bb2d8f0e281a9157e8fc8b04e9 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Tue, 1 May 2018 18:42:55 +0200 Subject: [PATCH 1/2] Adjust symbol indentifier is builtin/type error codes of all tests --- test/definition/derived/error/identifier_is_type.casm | 2 +- test/definition/enumeration/error/identifier_is_builtin.casm | 2 +- test/definition/enumeration/error/identifier_is_type.casm | 2 +- test/definition/function/error/identifier_is_builtin.casm | 2 +- test/definition/function/error/identifier_is_type.casm | 2 +- test/definition/rule/error/identifier_is_builtin.casm | 2 +- test/definition/rule/error/identifier_is_type.casm | 2 +- test/definition/using/error/identifier_is_builtin.casm | 2 +- test/definition/using/error/identifier_is_type.casm | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/definition/derived/error/identifier_is_type.casm b/test/definition/derived/error/identifier_is_type.casm index d9a2366f..502abca6 100644 --- a/test/definition/derived/error/identifier_is_type.casm +++ b/test/definition/derived/error/identifier_is_type.casm @@ -42,7 +42,7 @@ CASM init foo -derived Integer -> Integer = //@ ERROR( d200 ) +derived Integer -> Integer = //@ ERROR( 0505 ) 42 rule foo = diff --git a/test/definition/enumeration/error/identifier_is_builtin.casm b/test/definition/enumeration/error/identifier_is_builtin.casm index 81ffbca5..452840d3 100644 --- a/test/definition/enumeration/error/identifier_is_builtin.casm +++ b/test/definition/enumeration/error/identifier_is_builtin.casm @@ -42,7 +42,7 @@ CASM init foo -enumeration assert = { bar, baz, qux } //@ ERROR( e100 ) +enumeration assert = { bar, baz, qux } //@ ERROR( 0504 ) rule foo = skip diff --git a/test/definition/enumeration/error/identifier_is_type.casm b/test/definition/enumeration/error/identifier_is_type.casm index 811eb6cf..e3b977ee 100644 --- a/test/definition/enumeration/error/identifier_is_type.casm +++ b/test/definition/enumeration/error/identifier_is_type.casm @@ -42,7 +42,7 @@ CASM init foo -enumeration Integer = { bar, baz, qux } //@ ERROR( e200 ) +enumeration Integer = { bar, baz, qux } //@ ERROR( 0505 ) rule foo = skip diff --git a/test/definition/function/error/identifier_is_builtin.casm b/test/definition/function/error/identifier_is_builtin.casm index b6862c71..d7a3f878 100644 --- a/test/definition/function/error/identifier_is_builtin.casm +++ b/test/definition/function/error/identifier_is_builtin.casm @@ -42,7 +42,7 @@ CASM init foo -function assert: Integer -> Integer //@ ERROR( f100 ) +function assert: Integer -> Integer //@ ERROR( 0504 ) rule foo = skip diff --git a/test/definition/function/error/identifier_is_type.casm b/test/definition/function/error/identifier_is_type.casm index d697fe09..4d2cb43d 100644 --- a/test/definition/function/error/identifier_is_type.casm +++ b/test/definition/function/error/identifier_is_type.casm @@ -42,7 +42,7 @@ CASM init foo -function Integer : -> Integer //@ ERROR( f200 ) +function Integer : -> Integer //@ ERROR( 0505 ) rule foo = skip diff --git a/test/definition/rule/error/identifier_is_builtin.casm b/test/definition/rule/error/identifier_is_builtin.casm index 02f7c70f..375237af 100644 --- a/test/definition/rule/error/identifier_is_builtin.casm +++ b/test/definition/rule/error/identifier_is_builtin.casm @@ -42,7 +42,7 @@ CASM init foo -rule assert( arg : Integer ) = skip //@ ERROR( 5001 ) +rule assert( arg : Integer ) = skip //@ ERROR( 0504 ) rule foo = skip diff --git a/test/definition/rule/error/identifier_is_type.casm b/test/definition/rule/error/identifier_is_type.casm index 7eaa0cd4..dbda7838 100644 --- a/test/definition/rule/error/identifier_is_type.casm +++ b/test/definition/rule/error/identifier_is_type.casm @@ -42,5 +42,5 @@ CASM init foo -rule Integer = //@ ERROR( 5002 ) +rule Integer = //@ ERROR( 0505 ) skip diff --git a/test/definition/using/error/identifier_is_builtin.casm b/test/definition/using/error/identifier_is_builtin.casm index f8ab429f..5dea6f7b 100644 --- a/test/definition/using/error/identifier_is_builtin.casm +++ b/test/definition/using/error/identifier_is_builtin.casm @@ -44,7 +44,7 @@ CASM init foo -using assert = Integer //@ ERROR( 6001 ) +using assert = Integer //@ ERROR( 0504 ) rule foo = skip diff --git a/test/definition/using/error/identifier_is_type.casm b/test/definition/using/error/identifier_is_type.casm index 437fb563..fb2b6e33 100644 --- a/test/definition/using/error/identifier_is_type.casm +++ b/test/definition/using/error/identifier_is_type.casm @@ -44,8 +44,8 @@ CASM init foo -using Integer = Integer //@ ERROR( 6002 ) -using String = Integer //@ ERROR( 6002 ) +using Integer = Integer //@ ERROR( 0505 ) +using String = Integer //@ ERROR( 0505 ) rule foo = skip From 117d720b407920c0583a657d05d270a02bfe06f4 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Tue, 1 May 2018 18:55:30 +0200 Subject: [PATCH 2/2] Adjust "identifier is already used" error codes of all tests --- test/definition/derived/error/redefinition.casm | 2 +- .../error/enumerator_identifiers_already_used.casm | 2 +- .../definition/enumeration/error/identifier_already_used.casm | 2 +- .../function/error/identifier_is_enumeration_name.casm | 2 +- test/definition/function/error/redefinition.casm | 4 ++-- test/definition/rule/error/redefinition.casm | 2 +- test/definition/using/error/redefinition.casm | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/definition/derived/error/redefinition.casm b/test/definition/derived/error/redefinition.casm index 42fb73be..ee993a85 100644 --- a/test/definition/derived/error/redefinition.casm +++ b/test/definition/derived/error/redefinition.casm @@ -45,7 +45,7 @@ CASM init foo derived bar -> Integer = 42 -derived bar -> Integer = //@ ERROR( d000 ) +derived bar -> Integer = //@ ERROR( 0506 ) 42 rule foo = diff --git a/test/definition/enumeration/error/enumerator_identifiers_already_used.casm b/test/definition/enumeration/error/enumerator_identifiers_already_used.casm index c449494d..96bac5c1 100644 --- a/test/definition/enumeration/error/enumerator_identifiers_already_used.casm +++ b/test/definition/enumeration/error/enumerator_identifiers_already_used.casm @@ -45,7 +45,7 @@ CASM init foo enumeration bar = { a , b -, b //@ ERROR( e001 ) +, b //@ ERROR( 0506 ) , c } diff --git a/test/definition/enumeration/error/identifier_already_used.casm b/test/definition/enumeration/error/identifier_already_used.casm index 64b325ed..6f3942ca 100644 --- a/test/definition/enumeration/error/identifier_already_used.casm +++ b/test/definition/enumeration/error/identifier_already_used.casm @@ -44,7 +44,7 @@ CASM init foo enumeration bar = { x, y, z } -enumeration bar = { a, b, c } //@ ERROR( e000 ) +enumeration bar = { a, b, c } //@ ERROR( 0506 ) rule foo = skip diff --git a/test/definition/function/error/identifier_is_enumeration_name.casm b/test/definition/function/error/identifier_is_enumeration_name.casm index 5aef9196..8cfb762c 100644 --- a/test/definition/function/error/identifier_is_enumeration_name.casm +++ b/test/definition/function/error/identifier_is_enumeration_name.casm @@ -44,7 +44,7 @@ CASM init foo function a : -> Integer -enumeration a = { bar, baz } //@ ERROR( e000 ) +enumeration a = { bar, baz } //@ ERROR( 0506 ) rule foo = skip diff --git a/test/definition/function/error/redefinition.casm b/test/definition/function/error/redefinition.casm index b384ca71..4b7c5d7d 100644 --- a/test/definition/function/error/redefinition.casm +++ b/test/definition/function/error/redefinition.casm @@ -42,9 +42,9 @@ CASM init foo -function x : -> Integer //@ ERROR( f010 ) +function x : -> Integer //@ ERROR( 0506 ) -function x : -> Integer //@ ERROR( f010 ) +function x : -> Integer //@ ERROR( 0506 ) rule foo = skip diff --git a/test/definition/rule/error/redefinition.casm b/test/definition/rule/error/redefinition.casm index 37add6f6..58d515a1 100644 --- a/test/definition/rule/error/redefinition.casm +++ b/test/definition/rule/error/redefinition.casm @@ -45,5 +45,5 @@ CASM init foo rule foo = skip -rule foo = //@ ERROR( 5000 ) +rule foo = //@ ERROR( 0506 ) skip diff --git a/test/definition/using/error/redefinition.casm b/test/definition/using/error/redefinition.casm index edd78791..7e40f8a6 100644 --- a/test/definition/using/error/redefinition.casm +++ b/test/definition/using/error/redefinition.casm @@ -45,7 +45,7 @@ CASM init foo using MyType = Boolean -using MyType = Integer //@ ERROR( 6000 ) +using MyType = Integer //@ ERROR( 0506 ) rule foo = skip