From 39b205d12af34c0c8d6e691da2628bc386b70cf2 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Thu, 4 Nov 2010 21:00:26 +0000 Subject: [PATCH] dependencies between statuses simplified --- .../components/grafite_parser/grafiteParser.ml | 6 +++--- .../grafite_parser/grafiteParser.mli | 4 ++-- matita/components/statuses.txt | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml index 948519086..5b092a6d3 100644 --- a/matita/components/grafite_parser/grafiteParser.ml +++ b/matita/components/grafite_parser/grafiteParser.ml @@ -630,19 +630,19 @@ type db = ast_statement localized_option Grammar.Entry.e ;; class type g_status = object - inherit LexiconTypes.g_status + inherit CicNotationParser.g_status method parser_db: db end class status = object(self) - inherit LexiconTypes.status as super + inherit CicNotationParser.status ~keywords:[] val mutable db = None method parser_db = match db with None -> assert false | Some x -> x method set_parser_db v = {< db = Some v >} method set_parser_status : 'status. #g_status as 'status -> 'self - = fun o -> {< db = Some o#parser_db >}#set_lexicon_engine_status o + = fun o -> {< db = Some o#parser_db >}#set_notation_parser_status o initializer let grammar = CicNotationParser.level2_ast_grammar self in db <- Some (mk_parser (Grammar.Entry.create grammar "statement") self) diff --git a/matita/components/grafite_parser/grafiteParser.mli b/matita/components/grafite_parser/grafiteParser.mli index 11fbccaed..451c17c68 100644 --- a/matita/components/grafite_parser/grafiteParser.mli +++ b/matita/components/grafite_parser/grafiteParser.mli @@ -33,13 +33,13 @@ type db class type g_status = object - inherit LexiconTypes.g_status + inherit CicNotationParser.g_status method parser_db: db end class status : object('self) - inherit LexiconTypes.status + inherit CicNotationParser.status method parser_db : db method set_parser_db : db -> 'self method set_parser_status : 'status. #g_status as 'status -> 'self diff --git a/matita/components/statuses.txt b/matita/components/statuses.txt index d4fb967b7..2e9c9e3dd 100644 --- a/matita/components/statuses.txt +++ b/matita/components/statuses.txt @@ -1,15 +1,15 @@ grafitetypes |--> dumpable |--> nciclibrary - |--> grafiteparser ----- - |--> tac | - |--> auto | - |--> eq | - |-------------> lexicon - |--> notation_parser - |--> interpretation - | |--> nciccoercion --> unif_hint - |--> termcontentpres + |--> grafiteparser --> notation_parser + |--> tac + |--> auto + |--> eq + |--> lexicon + |--> notation_parser + |--> interpretation + | |--> nciccoercion --> unif_hint + |--> termcontentpres applytransformation | -- 2.39.2