X-Git-Url: http://sigaev.ru/git/gitweb.cgi?a=blobdiff_plain;f=data%2Ftemplate.tmpl;h=95e0060b6cdf0d4eb69ad891bf47d85b928ea86c;hb=029b7a56ef910c2430ddb40a7383c7caa640ecc1;hp=774a0b37e251e9b77c2400959f52ab555ceccd94;hpb=ac6f06173082a74d22e6a39df025eb4aad98bc0a;p=tedtools.git

diff --git a/data/template.tmpl b/data/template.tmpl
index 774a0b3..95e0060 100644
--- a/data/template.tmpl
+++ b/data/template.tmpl
@@ -1,43 +1,57 @@
 id: <% ID %> - <i>simple</i>
 idhex: <% ID, "0x%08x" %> - <b>HEX
-idhexdef: <% ID, "HEX(0x%08x)" || "-1" %> -<
+idhexdef: <% ID, "HEX(0x%08x)" # "-1" %> -<
 ndef: <% ndefID %>
-ndef def: <% ndefID || "Wow" %>
+ndef def: <% ndefID # "Wow" %>
 empty <% EmptyId %>
-empty def: <% EmptyId || "\"EmptyId\" - default"  %>
+empty def: <% EmptyId # "\"EmptyId\" - default"  %>
 zero <% zeroID %>
-zero def: <% zeroID || "zeroID"  %><# COMENT
+zero def: <% zeroID # "zeroID"  %><# COMENT
 #>
 
 <@ IF ID @>ID-YES<@ ELSE @>ID-NO<@ ENDIF @>
-<@ IF DEFINED ID @>DEFINED ID-YES<@ ELSE @>DEFINED ID-NO<@ ENDIF @>
-<@ IF NOT ID @>DEFINED ID-YES<@ ELSE @>NOT ID-NO<@ ENDIF @>
-<@ IF NOT DEFINED ID @>DEFINED ID-YES<@ ELSE @>NOT DEFINED ID-NO<@ ENDIF @>
+<@ IF DEFINED(ID) @>DEFINED ID-YES<@ ELSE @>DEFINED ID-NO<@ ENDIF @>
+<@ IF !ID @>DEFINED ID-YES<@ ELSE @>NOT ID-NO<@ ENDIF @>
+<@ IF ! DEFINED (ID) @>DEFINED ID-YES<@ ELSE @>NOT DEFINED ID-NO<@ ENDIF @>
 
 <@ IF ndefID @>ndefID-YES<@ ELSE @>ndefID-NO<@ ENDIF @>
-<@ IF DEFINED ndefID @>DEFINED ndefID-YES<@ ELSE @>DEFINED ndefID-NO<@ ENDIF @>
-<@ IF NOT ndefID @>DEFINED ndefID-YES<@ ELSE @>NOT ndefID-NO<@ ENDIF @>
-<@ IF NOT DEFINED ndefID @>DEFINED ndefID-YES<@ ELSE @>NOT DEFINED ndefID-NO<@ ENDIF @>
+<@ IF DEFINED (ndefID) @>DEFINED ndefID-YES<@ ELSE @>DEFINED ndefID-NO<@ ENDIF @>
+<@ IF ! (ndefID) @>DEFINED ndefID-YES<@ ELSE @>NOT ndefID-NO<@ ENDIF @>
+<@ IF ! DEFINED (ndefID) @>DEFINED ndefID-YES<@ ELSE @>NOT DEFINED ndefID-NO<@ ENDIF @>
 
 
 <@ IF EmptyId @>EmptyId-YES<@ ELSE @>EmptyId-NO<@ ENDIF @>
-<@ IF DEFINED EmptyId @>DEFINED EmptyId-YES<@ ELSE @>DEFINED EmptyId-NO<@ ENDIF @>
-<@ IF NOT EmptyId @>DEFINED EmptyId-YES<@ ELSE @>NOT EmptyId-NO<@ ENDIF @>
-<@ IF NOT DEFINED EmptyId @>DEFINED EmptyId-YES<@ ELSE @>NOT DEFINED EmptyId-NO<@ ENDIF @>
+<@ IF DEFINED (EmptyId) @>DEFINED EmptyId-YES<@ ELSE @>DEFINED EmptyId-NO<@ ENDIF @>
+<@ IF ! EmptyId @>DEFINED EmptyId-YES<@ ELSE @>NOT EmptyId-NO<@ ENDIF @>
+<@ IF ! DEFINED (EmptyId) @>DEFINED EmptyId-YES<@ ELSE @>NOT DEFINED EmptyId-NO<@ ENDIF @>
 
 <@ IF zeroID @>zeroID-YES<@ ELSE @>zeroID-NO<@ ENDIF @>
-<@ IF DEFINED zeroID @>DEFINED zeroID-YES<@ ELSE @>DEFINED zeroID-NO<@ ENDIF @>
-<@ IF NOT zeroID @>DEFINED zeroID-YES<@ ELSE @>NOT zeroID-NO<@ ENDIF @>
-<@ IF NOT DEFINED zeroID @>DEFINED zeroID-YES<@ ELSE @>NOT DEFINED zeroID-NO<@ ENDIF @>
+<@ IF DEFINED (zeroID) @>DEFINED zeroID-YES<@ ELSE @>DEFINED zeroID-NO<@ ENDIF @>
+<@ IF ! zeroID @>DEFINED zeroID-YES<@ ELSE @>NOT zeroID-NO<@ ENDIF @>
+<@ IF ! DEFINED(zeroID) @>DEFINED zeroID-YES<@ ELSE @>NOT DEFINED zeroID-NO<@ ENDIF @>
+
+id*2 <% ID * 2 %> 
+id+2 <% ID + 2 %> 
+(id+2)*2 <% (ID + 2)*2 %> 
+id+2*2 <% ID + 2*2 %> 
+id*2+2 <% ID * 2+2 %>
+id*3+zeroID <% ID * 2+zeroID %>
+length(str) <% length (str) %>
+length(str) > 3: <% length(str) > 3 %>
+
+<@ if length(str) < 10 && id > 16 @>HEH-1<@ endif @>
+CallCounter: <% CallCounter() %>
+
+str ? "yes" : -1 = <% str ? "yes" : -1 %>
 
 <@ IF ID @>
-	<@ IF DEFINED zeroID @>
+	<@ IF DEFINED(zeroID) @>
 		ID!=0 && defined(zeroID) - right
 	<@ ELSE @>
 		ID!=0 && !defined(zeroID)
 	<@endif@>
 <@ELSE@>
-	<@ IF DEFINED zeroID @>
+	<@ IF DEFINED (zeroID) @>
 		ID==0 && defined(zeroID)
 	<@ ELSE @>
 		ID==0 && && !defined(zeroID)
@@ -46,7 +60,7 @@ zero def: <% zeroID || "zeroID"  %><# COMENT
 
 
 <@ LOOP outerLoop @>
-	<% __COUNTER %>/<% __SIZE %>. odd:<% __ODD %> even:<% __EVEN %> <# <@if __FIRST @>FIRST<@endif@> <@if __LAST @>LAST<@endif@> id: <% ^ID %> <% DATA1 %>:<% DATA2 || "Data is absent" %>/<% DATA1 %> #>
+	<% __COUNTER %>/<% __SIZE %>. odd:<% __ODD %> even:<% __EVEN %> <# <@if __FIRST @>FIRST<@endif@> <@if __LAST @>LAST<@endif@> id: <% ^ID %> <% DATA1 %>:<% DATA2 # "Data is absent" %>/<% DATA1 %> #>
 	
 	<& data/template_include.tmpl &>
 	<@ LOOP innerLoop @>