From f4d5322d15f30078390ba1db72ab3977883b167f Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 29 Mar 2010 20:43:00 +0200 Subject: [PATCH] Added soft_touch Version:1.1.48 --- src/irpf90_t.py | 6 ++++++ src/parsed_text.py | 5 ++++- src/preprocessed_text.py | 1 + src/version.py | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/irpf90_t.py b/src/irpf90_t.py index b1658dc..8fea5af 100644 --- a/src/irpf90_t.py +++ b/src/irpf90_t.py @@ -137,6 +137,12 @@ class Touch(Line): def __repr__(self): return "%20s:%5d : %s"%("Touch",self.i,self.text) +class SoftTouch(Touch): + def __init__(self,i,text,filename): + Line.__init__(self,i,text,filename) + def __repr__(self): + return "%20s:%5d : %s"%("SoftTouch",self.i,self.text) + class Irp_read(Line): def __init__(self,i,text,filename): Line.__init__(self,i,text,filename) diff --git a/src/parsed_text.py b/src/parsed_text.py index b2ce7c3..4e04dbb 100644 --- a/src/parsed_text.py +++ b/src/parsed_text.py @@ -180,7 +180,10 @@ def get_parsed_text(): error.fail(line,"Variable %s unknown"%(x,)) return ([],Simple_line(line.i," %s_is_built = .True."%(x,),line.filename)) result += map( fun, main_vars[:-1] ) - result += [ ([],Provide_all(line.i,"! <<< END TOUCH",line.filename)) ] + if isinstance(line,SoftTouch): + result += [ ([],Simple_line(line.i,"! <<< END TOUCH (Soft)",line.filename)) ] + else: + result += [ ([],Provide_all(line.i,"! <<< END TOUCH",line.filename)) ] elif type(line) in [ Begin_provider, Cont_provider ]: if isinstance(line,Begin_provider): varlist = [] diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py index 33aa6c6..9e96a7e 100644 --- a/src/preprocessed_text.py +++ b/src/preprocessed_text.py @@ -58,6 +58,7 @@ simple_dict = { "end_provider": End_provider , "assert": Assert , "touch": Touch , + "soft_touch": SoftTouch , "provide": Provide , "free": Free , "irp_if": Irp_If , diff --git a/src/version.py b/src/version.py index c0d42cc..8879ada 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.1.47" +version = "1.1.48"