Merge pull request #5 from blutsvente/master

New release 1.0.3
tsvi · May 30, 2020 · 17e6994 · 17e6994
2 parents e17aa62 + 0e952e3
commit 17e6994
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2020-05-30
+### Changed
+- minor fix for struct member declaration
+- removed module as keyword
+- fixed struct/unit member decl.
+- improved constraint matching
+
+### Added
+- matching of event declarations to member-declaration scope
+- matching of sized-list decl.
+- added curly braces to stray-bracket checks
+
 ## [1.0.2] - 2020-04-22
 ### Changed
 - minor fixes for numeric literals

diff --git a/SpecmanCode.sublime-syntax b/SpecmanCode.sublime-syntax
diff --git a/test/constraints.e b/test/constraints.e
@@ -5,45 +5,54 @@ bla
 
 <'
 
-   struct s {
-      keep a;
-      keep named_constraint is a;
-      keep a == TRUE;
-      keep soft a;
-      keep b.reset_soft();
-      keep b => not foo;
-      keep not read_only(b) => foo;
+struct s {
+   keep a;
+   keep named_constraint is a;
+   keep a == TRUE;
+   keep soft a;
+   keep b.reset_soft();
+   keep b => not foo;
+   keep not read_only(b) => foo;
 
-      keep soft p.hdl_path() == "bla\n";
+   keep soft p.hdl_path() == "bla\n";
 
-      keep soft a before b;
+   keep soft a before b;
 
-      keep a.all_different();
+   keep a.all_different();
 
-      keep soft lst == {q;w;e;r;t}.sort();
-      keep soft lst_elem in {a;b};
+   keep soft lst == {q;w;e;r;t}.sort();
+   keep soft lst_elem in {a;b};
 
-      keep lst2d == {matrix; {1;2;3}};
+   keep lst2d == {matrix; {1;2;3}};
 
-      keep soft for each (bla) using index (i) in lst {
-         x.reset_soft();
+   keep soft for each (bla) using index (i) in lst {
+      x.reset_soft();
          it == read_only(me.x/2); -- comment
          read_only(a) => implies_b;
-      };
-
-      keep foo => all of {
-         l.unique();
-      };
+   };
 
-      keep my_constraint is  all of {
+   keep foo => all of {
+      l.unique();
+   };
 
-      };
+   keep my_constraint is  all of {
 
-      keep  soft  a  ==  select  { 10: TRUE; 90: FALSE;};
+   };
 
-      keep soft shden == read_only(shadow_update_enable).as_a(bit);
-      keep soft shden == read_only(shadow_update_enable).as_a(bit);
+   keep read_only(a) == b => all of {
 
    };
 
+   keep  soft  a  ==  select  { 10: TRUE; 90: FALSE;};
+
+   keep soft shden == read_only(shadow_upd_enable).as_a(bit);
+   keep  soft  shden == read_only (shadow_updenable).as_a ( bit );
+
+};
+
+
+extend has_info Start vr_ad_sequence {
+   keep start_reg.start == read_only(context.setup.is_selected(static_reg_file.name).as_a(bit));
+};
+
 '>
diff --git a/test/coverage.e b/test/coverage.e
@@ -21,5 +21,9 @@ extend sys {
        range([set_of_values(address_t).max()], "Last address");
    };
 
+   cover done is also {
+      item len using also (ignore = it<2);
+   };
+
 };
 '>
diff --git a/test/e_test.e b/test/e_test.e
@@ -19,7 +19,8 @@ extend sys {
     @import_python(module_name="plot_i", python_name="addVal")
     addVal(groupName:string, cycle:int,grade:real) is imported;
 
-    l1[20] : list of byte;
+    !l1[20][3] : list of byte;
+    l2 : list of uint;
 
     obj: obj_s is instance;
 
@@ -50,6 +51,11 @@ extend sys {
             start foo(a+b);
         };
 
+        all of {
+        		{ first_tcm(); };
+        		{ second_tcm(); };
+        };
+
         do sequence keeping { it == seq };
 
         var l: list of int = {1;2;7;4}.sort();

diff --git a/test/pack_unpack_1.e b/test/pack_unpack_1.e
diff --git a/test/pack_unpack_2.e b/test/pack_unpack_2.e
diff --git a/test/pygments_test.e b/test/pygments_test.e
@@ -2,20 +2,20 @@
 <'
 
 extend sys {
-    transfer_started_i : in interface_port of tlm_analysis of MONITOR xbus_trans_s 
+    transfer_started_i : in interface_port of tlm_analysis of MONITOR xbus_trans_s
       of FOO bar of QUUX quax using prefix=pfx_ is instance;
 
     compare_payloads(exp_payload : xserial_frame_payload_s, compare_dest : bool): list of string is also {
         if exp_payload is a DATA xserial_frame_payload_s (d) and
            d.data != data {
-            result.add(append("Expected data field: ", 
+            result.add(append("Expected data field: ",
                               hex(d.data),
-                              ", Actual data field: ", 
+                              ", Actual data field: ",
                               hex(data)));
         };
 
         // Lexer test only. This will not compile
-        print sys.xbus_evc.active_masters[0].ACTIVE'MASTER'driver
+        print sys.xbus_evc.active_masters[0].ACTIVE'MASTER'driver;
     }; -- compare_payloads()
 
     test_payloads(exp_payload : xserial_frame_payload_s, compare_dest : bool): list of string @x is also {

diff --git a/test/structs_and_units.e b/test/structs_and_units.e
@@ -17,11 +17,17 @@ struct bar_s {
 };
 
 unit foo_u {
-   bar    : GREEN'my_det bar_s;
-   const b: bool;
-   det    : [BLUE, RED, GREEN];
-   bar_l  : list of bar_s;
-   const i: uint[0..10](bits: 3);
+   bar      : GREEN'my_det bar_s;
+   const b  : bool;
+   det      : [BLUE, RED, GREEN];
+   bar_l    : list of bar_s;
+   const i  : uint[0..10](bits: 3);
+   bar_l2[2]: list of bar_s;
+
+   static check:check_u is instance;
+   const my: a'det b'det my_struct is instance;
+
+   agents: list of list of agent_u is instance;
 
    when BLUE foo_u {