Partial attr. support, build/run targets, literals

8 files changed, 336 insertions, 52 deletions

diff --git a/data/property/cnes/CNE_01700.pro b/data/property/cnes/CNE_01700.pro
index edbb622..db5e676 100644
--- a/data/property/cnes/CNE_01700.pro
+++ b/data/property/cnes/CNE_01700.pro
@@ -63,12 +63,38 @@
                                     (AF
                                        (and
                                           (kind "if")
-                                          (is_read_structure "(??)")
                                           (or
-                                             (is_read_element "0" "falling_edge")
-                                             (is_read_element "0" "rising_edge")
+                                             (and
+                                                (is_read_structure "(??)")
+                                                (or
+                                                   (is_read_element "0" "falling_edge")
+                                                   (is_read_element "0" "rising_edge")
+                                                )
+                                                (is_read_element "1" clk1)
+                                             )
+                                             (and
+                                                (is_read_structure "(?(??)(???))")
+                                                (is_read_element "0" "and")
+                                                (is_read_element "1" "event")
+                                                (is_read_element "2" clk1)
+                                                (is_read_element "3" "=")
+                                                (or
+                                                   (is_read_element "4" clk1)
+                                                   (is_read_element "5" clk1)
+                                                )
+                                             )
+                                             (and
+                                                (is_read_structure "(?(???)(??))")
+                                                (is_read_element "0" "and")
+                                                (is_read_element "1" "=")
+                                                (or
+                                                   (is_read_element "2" clk1)
+                                                   (is_read_element "3" clk1)
+                                                )
+                                                (is_read_element "4" "event")
+                                                (is_read_element "5" clk1)
+                                             )
                                           )
-                                          (is_read_element "1" clk1)
                                           (EX
                                              (and
                                                 (has_option "cond_was_true")
@@ -109,12 +135,38 @@
                                                    (and
                                                       (not (has_option "cond_was_true"))
                                                       (kind "if")
-                                                      (is_read_structure "(??)")
                                                       (or
-                                                         (is_read_element "0" "falling_edge")
-                                                         (is_read_element "0" "rising_edge")
+                                                         (and
+                                                            (is_read_structure "(??)")
+                                                            (or
+                                                               (is_read_element "0" "falling_edge")
+                                                               (is_read_element "0" "rising_edge")
+                                                            )
+                                                            (is_read_element "1" clk1)
+                                                         )
+                                                         (and
+                                                            (is_read_structure "(?(??)(???))")
+                                                            (is_read_element "0" "and")
+                                                            (is_read_element "1" "event")
+                                                            (is_read_element "2" clk1)
+                                                            (is_read_element "3" "=")
+                                                            (or
+                                                               (is_read_element "4" clk1)
+                                                               (is_read_element "5" clk1)
+                                                            )
+                                                         )
+                                                         (and
+                                                            (is_read_structure "(?(???)(??))")
+                                                            (is_read_element "0" "and")
+                                                            (is_read_element "1" "=")
+                                                            (or
+                                                               (is_read_element "2" clk1)
+                                                               (is_read_element "3" clk1)
+                                                            )
+                                                            (is_read_element "4" "event")
+                                                            (is_read_element "5" clk1)
+                                                         )
                                                       )
-                                                      (is_read_element "1" clk1)
                                                       (EX
                                                          (and
                                                             (has_option "cond_was_true")
diff --git a/data/property/cnes/CNE_01800.pro b/data/property/cnes/CNE_01800.pro
index 521cd8a..fe69841 100644
--- a/data/property/cnes/CNE_01800.pro
+++ b/data/property/cnes/CNE_01800.pro
@@ -60,12 +60,38 @@
                                     (AF
                                        (and
                                           (kind "if")
-                                          (is_read_structure "(??)")
                                           (or
-                                             (is_read_element "0" "falling_edge")
-                                             (is_read_element "0" "rising_edge")
+                                             (and
+                                                (is_read_structure "(??)")
+                                                (or
+                                                   (is_read_element "0" "falling_edge")
+                                                   (is_read_element "0" "rising_edge")
+                                                )
+                                                (is_read_element "1" clk1)
+                                             )
+                                             (and
+                                                (is_read_structure "(?(??)(???))")
+                                                (is_read_element "0" "and")
+                                                (is_read_element "1" "event")
+                                                (is_read_element "2" clk1)
+                                                (is_read_element "3" "=")
+                                                (or
+                                                   (is_read_element "4" clk1)
+                                                   (is_read_element "5" clk1)
+                                                )
+                                             )
+                                             (and
+                                                (is_read_structure "(?(???)(??))")
+                                                (is_read_element "0" "and")
+                                                (is_read_element "1" "=")
+                                                (or
+                                                   (is_read_element "2" clk1)
+                                                   (is_read_element "3" clk1)
+                                                )
+                                                (is_read_element "4" "event")
+                                                (is_read_element "5" clk1)
+                                             )
                                           )
-                                          (is_read_element "1" clk1)
                                           (EX
                                              (and
                                                 (has_option "cond_was_true")
@@ -106,12 +132,38 @@
                                                    (and
                                                       (not (has_option "cond_was_true"))
                                                       (kind "if")
-                                                      (is_read_structure "(??)")
                                                       (or
-                                                         (is_read_element "0" "falling_edge")
-                                                         (is_read_element "0" "rising_edge")
+                                                         (and
+                                                            (is_read_structure "(??)")
+                                                            (or
+                                                               (is_read_element "0" "falling_edge")
+                                                               (is_read_element "0" "rising_edge")
+                                                            )
+                                                            (is_read_element "1" clk1)
+                                                         )
+                                                         (and
+                                                            (is_read_structure "(?(??)(???))")
+                                                            (is_read_element "0" "and")
+                                                            (is_read_element "1" "event")
+                                                            (is_read_element "2" clk1)
+                                                            (is_read_element "3" "=")
+                                                            (or
+                                                               (is_read_element "4" clk1)
+                                                               (is_read_element "5" clk1)
+                                                            )
+                                                         )
+                                                         (and
+                                                            (is_read_structure "(?(???)(??))")
+                                                            (is_read_element "0" "and")
+                                                            (is_read_element "1" "=")
+                                                            (or
+                                                               (is_read_element "2" clk1)
+                                                               (is_read_element "3" clk1)
+                                                            )
+                                                            (is_read_element "4" "event")
+                                                            (is_read_element "5" clk1)
+                                                         )
                                                       )
-                                                      (is_read_element "1" clk1)
                                                       (EX
                                                          (and
                                                             (has_option "cond_was_true")
diff --git a/data/property/cnes/CNE_01900.pro b/data/property/cnes/CNE_01900.pro
index 6e2beff..51c373f 100644
--- a/data/property/cnes/CNE_01900.pro
+++ b/data/property/cnes/CNE_01900.pro
@@ -22,12 +22,38 @@
                               (AF
                                  (and
                                     (kind "if")
-                                    (is_read_structure "(??)")
                                     (or
-                                       (is_read_element "0" "falling_edge")
-                                       (is_read_element "0" "rising_edge")
+                                       (and
+                                          (is_read_structure "(??)")
+                                          (or
+                                             (is_read_element "0" "falling_edge")
+                                             (is_read_element "0" "rising_edge")
+                                          )
+                                          (is_read_element "1" clk1)
+                                       )
+                                       (and
+                                          (is_read_structure "(?(??)(???))")
+                                          (is_read_element "0" "and")
+                                          (is_read_element "1" "event")
+                                          (is_read_element "2" clk1)
+                                          (is_read_element "3" "=")
+                                          (or
+                                             (is_read_element "4" clk1)
+                                             (is_read_element "5" clk1)
+                                          )
+                                       )
+                                       (and
+                                          (is_read_structure "(?(???)(??))")
+                                          (is_read_element "0" "and")
+                                          (is_read_element "1" "=")
+                                          (or
+                                             (is_read_element "2" clk1)
+                                             (is_read_element "3" clk1)
+                                          )
+                                          (is_read_element "4" "event")
+                                          (is_read_element "5" clk1)
+                                       )
                                     )
-                                    (is_read_element "1" clk1)
                                     (EX
                                        (and
                                           (has_option "cond_was_true")
@@ -67,12 +93,38 @@
                                              (and
                                                 (not (has_option "cond_was_true"))
                                                 (kind "if")
-                                                (is_read_structure "(??)")
                                                 (or
-                                                   (is_read_element "0" "falling_edge")
-                                                   (is_read_element "0" "rising_edge")
+                                                   (and
+                                                      (is_read_structure "(??)")
+                                                      (or
+                                                         (is_read_element "0" "falling_edge")
+                                                         (is_read_element "0" "rising_edge")
+                                                      )
+                                                      (is_read_element "1" clk1)
+                                                   )
+                                                   (and
+                                                      (is_read_structure "(?(??)(???))")
+                                                      (is_read_element "0" "and")
+                                                      (is_read_element "1" "event")
+                                                      (is_read_element "2" clk1)
+                                                      (is_read_element "3" "=")
+                                                      (or
+                                                         (is_read_element "4" clk1)
+                                                         (is_read_element "5" clk1)
+                                                      )
+                                                   )
+                                                   (and
+                                                      (is_read_structure "(?(???)(??))")
+                                                      (is_read_element "0" "and")
+                                                      (is_read_element "1" "=")
+                                                      (or
+                                                         (is_read_element "2" clk1)
+                                                         (is_read_element "3" clk1)
+                                                      )
+                                                      (is_read_element "4" "event")
+                                                      (is_read_element "5" clk1)
+                                                   )
                                                 )
-                                                (is_read_element "1" clk1)
                                                 (EX
                                                    (and
                                                       (has_option "cond_was_true")
diff --git a/data/property/cnes/STD_04800.pro b/data/property/cnes/STD_04800.pro
index 5f9e817..ae8e4c9 100644
--- a/data/property/cnes/STD_04800.pro
+++ b/data/property/cnes/STD_04800.pro
@@ -6,10 +6,46 @@
       (exists ps_re process
          (CTL_verifies ps_re
             (EF
-               (and
-                  (is_read_structure "(??)")
-                  (is_read_element "0" "rising_edge")
-                  (is_read_element "1" wfm)
+               (or
+                  (and
+                     (is_read_structure "(??)")
+                     (is_read_element "0" "rising_edge")
+                     (is_read_element "1" wfm)
+                  )
+                  (and
+                     (is_read_structure "(?(??)(???))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "event")
+                     (is_read_element "2" wfm)
+                     (is_read_element "3" "=")
+                     (or
+                        (and
+                           (is_read_element "4" wfm)
+                           (is_read_element "5" "'1'")
+                        )
+                        (and
+                           (is_read_element "4" "'1'")
+                           (is_read_element "5" wfm)
+                        )
+                     )
+                  )
+                  (and
+                     (is_read_structure "(?(???)(??))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "=")
+                     (or
+                        (and
+                           (is_read_element "2" wfm)
+                           (is_read_element "3" "'1'")
+                        )
+                        (and
+                           (is_read_element "2" "'1'")
+                           (is_read_element "3" wfm)
+                        )
+                     )
+                     (is_read_element "4" "event")
+                     (is_read_element "5" wfm)
+                  )
                )
             )
          )
@@ -17,10 +53,46 @@
       (exists ps_fe process
          (CTL_verifies ps_fe
             (EF
-               (and
-                  (is_read_structure "(??)")
-                  (is_read_element "0" "falling_edge")
-                  (is_read_element "1" wfm)
+               (or
+                  (and
+                     (is_read_structure "(??)")
+                     (is_read_element "0" "falling_edge")
+                     (is_read_element "1" wfm)
+                  )
+                  (and
+                     (is_read_structure "(?(??)(???))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "event")
+                     (is_read_element "2" wfm)
+                     (is_read_element "3" "=")
+                     (or
+                        (and
+                           (is_read_element "4" wfm)
+                           (is_read_element "5" "'0'")
+                        )
+                        (and
+                           (is_read_element "4" "'0'")
+                           (is_read_element "5" wfm)
+                        )
+                     )
+                  )
+                  (and
+                     (is_read_structure "(?(???)(??))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "=")
+                     (or
+                        (and
+                           (is_read_element "2" wfm)
+                           (is_read_element "3" "'0'")
+                        )
+                        (and
+                           (is_read_element "2" "'0'")
+                           (is_read_element "3" wfm)
+                        )
+                     )
+                     (is_read_element "4" "event")
+                     (is_read_element "5" wfm)
+                  )
                )
             )
          )
diff --git a/data/property/impossible_processes.pro b/data/property/impossible_processes.pro
index a93e916..5a1bc78 100644
--- a/data/property/impossible_processes.pro
+++ b/data/property/impossible_processes.pro
@@ -2,11 +2,9 @@
    (
       (ps process WHAT_ARE_YOU_DOING)
    )
-   (forall sl1 waveform
-      (CTL_verifies ps
-         (not
-            (EF (expr_writes sl1))
-         )
+   (CTL_verifies ps
+      (not
+         (EF (expr_writes _))
       )
    )
 )
diff --git a/data/property/incrementer.pro b/data/property/incrementer.pro
index 4bc06ae..f119f99 100644
--- a/data/property/incrementer.pro
+++ b/data/property/incrementer.pro
@@ -6,9 +6,10 @@
    (CTL_verifies ps
       (EF
          (and
-            (is_read_structure "(??L)")
+            (is_read_structure "(???)")
             (is_read_element "0" "+")
-            (is_read_element "1" wf)
+            (is_read_element _ wf)
+            (is_read_element _ "L")
          )
       )
    )
diff --git a/data/property/likely_a_clock.pro b/data/property/likely_a_clock.pro
index 2aae4a4..afe4ed3 100644
--- a/data/property/likely_a_clock.pro
+++ b/data/property/likely_a_clock.pro
@@ -6,16 +6,47 @@
       (and
          (is_waveform_of wf clock)
          (exists ps process
-            (CTL_verifies ps
-               (EF
-                  (and
-                     (kind "if")
-                     (is_read_structure "(??)")
-                     (or
-                        (is_read_element "0" "rising_edge")
-                        (is_read_element "0" "falling_edge")
+            (and
+               (is_accessed_by wf ps)
+               (is_in_sensitivity_list wf ps)
+               (CTL_verifies ps
+                     (EF
+                        (and
+                           (kind "if")
+                           (or
+                              (and
+                                 (is_read_structure "(??)")
+                                 (or
+                                    (is_read_element "0" "falling_edge")
+                                    (is_read_element "0" "rising_edge")
+                                 )
+                                 (is_read_element "1" wf)
+                              )
+                              (and
+                                 (is_read_structure "(?(??)(???))")
+                                 (is_read_element "0" "and")
+                                 (is_read_element "1" "event")
+                                 (is_read_element "2" wf)
+                                 (is_read_element "3" "=")
+                                 (or
+                                    (is_read_element "4" wf)
+                                    (is_read_element "5" wf)
+                                 )
+                              )
+                              (and
+                                 (is_read_structure "(?(???)(??))")
+                                 (is_read_element "0" "and")
+                                 (is_read_element "1" "=")
+                                 (or
+                                    (is_read_element "2" wf)
+                                    (is_read_element "3" wf)
+                                 )
+                                 (is_read_element "4" "event")
+                                 (is_read_element "5" wf)
+                              )
+                           )
+                        )
                      )
-                     (is_read_element "1" wf)
                   )
                )
             )
diff --git a/data/property/simple_flip_flop.pro b/data/property/simple_flip_flop.pro
index ea67575..e1621c1 100644
--- a/data/property/simple_flip_flop.pro
+++ b/data/property/simple_flip_flop.pro
@@ -11,12 +11,38 @@
          (AF
             (and
                (kind "if")
-               (is_read_structure "(??)")
                (or
-                  (is_read_element "0" "falling_edge")
-                  (is_read_element "0" "rising_edge")
+                  (and
+                     (is_read_structure "(??)")
+                     (or
+                        (is_read_element "0" "falling_edge")
+                        (is_read_element "0" "rising_edge")
+                     )
+                     (is_read_element "1" clk)
+                  )
+                  (and
+                     (is_read_structure "(?(??)(???))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "event")
+                     (is_read_element "2" clk)
+                     (is_read_element "3" "=")
+                     (or
+                        (is_read_element "4" clk)
+                        (is_read_element "5" clk)
+                     )
+                  )
+                  (and
+                     (is_read_structure "(?(???)(??))")
+                     (is_read_element "0" "and")
+                     (is_read_element "1" "=")
+                     (or
+                        (is_read_element "2" clk)
+                        (is_read_element "3" clk)
+                     )
+                     (is_read_element "4" "event")
+                     (is_read_element "5" clk)
+                  )
                )
-               (is_read_element "1" clk)
                (EX
                   (and
                      (has_option "COND_WAS_TRUE")