diff --git a/coco/xreate.ATG b/coco/xreate.ATG
index 66e8ad4..2cd08f3 100644
--- a/coco/xreate.ATG
+++ b/coco/xreate.ATG
@@ -1,600 +1,619 @@
 //TODO add ListLiteral
 //TODO ExprTyped:  assign default(none) type
 
 #include "ast.h"
 #include "ExternLayer.h"
 #include "pass/adhocpass.h"
 #include <string>
 #include <stack>
 
 #define wprintf(format, ...) \
                 char __buffer[100];    \
                 wcstombs(__buffer, format, 100);   \
                 fprintf(stderr, __buffer, __VA_ARGS__)
                 
 using namespace xreate;
 using namespace std;
 
 COMPILER Xreate
 
  xreate::AST root;  // current program unit 
  
  struct {
-     std::stack<xreate::CodeScope*> scopesOld;
+    std::stack<xreate::CodeScope*> scopesOld;
     xreate::CodeScope* scope = nullptr;
  } context;
  
  void pushContextScope(CodeScope* scope){
     context.scopesOld.push(context.scope);
     context.scope = scope;
  }
  
  void popContextScope(){
         context.scope = context.scopesOld.top();
         context.scopesOld.pop();
  }
      
 int nextToken()
 {
   scanner->ResetPeek();
   return scanner->Peek()->kind;
 }
 
+bool checkTokenAfterIdent(int key){
+  if (la->kind != _ident) return false;
+  return  nextToken()  == key;
+}
+
 bool checkParametersList()
 {
     return la->kind == _ident && nextToken() == _lparen;
 }
 
 bool checkInfix()
 {
   return la->kind == _ident && nextToken() == _ident;
 }
 
 bool checkIndex()
 {
   return la->kind == _ident && nextToken()  == _lbrack;
 }
 
 bool checkFuncDecl()
 {
   if (la->kind != _ident) return false;
   
   int token2 = nextToken();
   int token3 = scanner->Peek()->kind;
   
   return  token2  == _assign && (token3 == _function || token3 == _pre);
 }
 
+
+
 bool checkAssignment()
 {
   if (la->kind != _ident) return false;
   
   scanner->ResetPeek();
   int token2 = scanner->Peek()->kind;
   if (token2 == _lcurbrack) {
       scanner->Peek();
       int token3 = scanner->Peek()->kind;
       if (token3 != _rcurbrack) return false;
       
       int token4 = scanner->Peek()->kind;
       return token4 == _assign;
   }
   
   return  token2  == _assign;
 }
 
 void recognizeIdentifier(Expression& i){
     if (!context.scope->recognizeIdentifier(i)){       
         if (!root.recognizeVariantIdentifier(i)){
             root.postponeIdentifier(context.scope, i);
         }
     }
 }
 
 enum SwitchKind{SWITCH_NORMAL, SWITCH_META};
 
 CHARACTERS
   letter = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".
   any = ANY - '"'.
   digit = "0123456789".
   cr  = '\r'.
   lf  = '\n'.
   tab = '\t'.
 
 TOKENS
   ident = (letter | '_') {letter | digit | '_'}.
   number = (digit | '-' digit) {digit}.
   string = '"' { any } '"'.
   function = "function".
   pre =  "pre".  
   lparen = '('. 
   rparen = ')'.
   lbrack = '['.
   rbrack = ']'.
   lcurbrack = '{'.
   rcurbrack = '}'.
   equal = "==".
   assign = '='.
   implic = '-' '>'.
   colon = ':'.
   context = "context".
   tagcolon   = "::".
   lse = "<=".
   lss = "<".
   gte = ">=".
   gtr = ">".
   
   ne1 = "!=".
   ne2= "<>".
   
 
 COMMENTS FROM "/*" TO "*/" NESTED
 COMMENTS FROM "//" TO lf
 
 IGNORE cr + lf + tab
 
 PRODUCTIONS
 
 Xreate =    (. Function* function; .)
 {(  RuleDecl 
     | InterfaceData | Imprt | ContextSection 
     | IF(checkFuncDecl()) FDecl<function>  (. root.add(function); .)
     | TDecl 
 )}                                         (. root.recognizePostponedIdentifiers(); .)
 .
 
 Ident<std::wstring& name>
 = ident                                     (. name = t->val; .).
 
 VarIdent<Expression& e>
 = ident                                     (. e = Expression(Atom<Identifier_t>(t->val)); .)
   [ lcurbrack (                              
         ident                               (. SemErr(coco_string_create("var version as ident is not implemented yet")); .)
       | number                              (. Attachments::put<VariableVersion>(e, Atom<Number_t>(t->val).get()); .)
   ) rcurbrack ]  .
   
 
 FDecl<Function*& f> =       (. std::wstring fname; std::wstring argName; TypeAnnotation typIn; TypeAnnotation typOut; bool flagIsPrefunct = false; Expression binding; .)
 Ident<fname> assign 
 [pre            (. flagIsPrefunct = true; .)]
 function 		(. f = new Function(fname); f->isPrefunction = flagIsPrefunct; CodeScope* entry = f->getEntryScope(); .)
 
 ['(' Ident<argName> tagcolon ExprAnnotations<binding>  (. f->addBinding(Atom<Identifier_t>(argName), move(binding)); .)
 {',' Ident<argName> tagcolon ExprAnnotations<binding>  (. f->addBinding(Atom <Identifier_t>(argName), move(binding));.)
 } ')']
 
 [ tagcolon  
 ( IF(flagIsPrefunct) FnTag<f>
   |  Type<typOut>
 )
 {';' FnTag<f> }]
 BDecl<entry>    (. entry->getBody().bindType(move(typOut));.)
 .
 
 ContextSection<>=                       (. Expression context; Function* f; .)
 "case" "context" tagcolon MetaSimpExpr<context>  
 lcurbrack { FDecl<f>                    (. f->guardContext = context; root.add(f); .)
 } rcurbrack.
 
   /**
    *                          TYPES  
    * 
    */
 TypeTerm<TypePrimitive& typ> =                       (. std::wstring tid; .)
   ("string" (. typ = TypePrimitive::String;.)
   | "num"   (. typ = TypePrimitive::Num;.)
   | "int"   (. typ = TypePrimitive::Int;.)
   | "float" (. typ = TypePrimitive::Float;.)
   | "bool" (. typ = TypePrimitive::Bool; .)
   | "i8"    (. typ = TypePrimitive::I8; .)
   | "i32"   (. typ = TypePrimitive::I32; .)
   | "i64"   (. typ = TypePrimitive::I64; .)
   ).
 
 Type<TypeAnnotation& typ> =  (. TypeAnnotation typ2; TypePrimitive typ3; std::wstring tid, field; .)
 ( 
   TList<typ>   
 | TStruct<typ>
 | TypeTerm<typ3> (. typ = typ3; .) 
 | IF (checkIndex()) Ident<tid> lbrack
       Ident<field>      (. typ = TypeAnnotation(TypeOperator::ACCESS, {}); typ.__valueCustom = Atom<Identifier_t>(tid).get(); typ.fields.push_back(Atom<Identifier_t>(field).get()); .)
       {',' Ident<field> (.  typ.fields.push_back(Atom<Identifier_t>(field).get());  .)
       } rbrack
       
 | Ident<tid>            (. typ = TypeAnnotation(TypeOperator::CUSTOM, {}); typ.__valueCustom = Atom<Identifier_t>(tid).get(); .)
     ['(' Type<typ2>     (. typ.__operator = TypeOperator::CALL; typ.__operands.push_back(typ2); .)
     {',' Type<typ2>     (. typ.__operands.push_back(typ2); .)
     } ')']
 ) .
 
-TList<TypeAnnotation& typ> =      (.      TypeAnnotation ty; .)
-    '[' Type<ty>                         (. typ = TypeAnnotation(TypeOperator::ARRAY, {ty}); .)
-    {',' Type<ty>                        (. typ.__operator = TypeOperator::TUPLE; typ.__operands.push_back(ty); .)
-    }']'
-  .
-  
-TStruct<TypeAnnotation& typ> = (. TypeAnnotation t; std::wstring field; .)
+TList<TypeAnnotation& typ> =            (.      TypeAnnotation ty; .)
+    '[' Type<ty> ']'                    (. typ = TypeAnnotation(TypeOperator::ARRAY, {ty}); .)
+.
+
+TStruct<TypeAnnotation& typ> = (. TypeAnnotation t; std::wstring key; size_t keyCounter=0; .)
   lcurbrack
-    Ident<field> tagcolon Type<t>       (. typ = TypeAnnotation(TypeOperator::STRUCT, {t}); typ.fields.push_back(Atom<Identifier_t>(field).get()); .)
-    {',' Ident<field> tagcolon Type<t>} (. typ.__operands.push_back(t); typ.fields.push_back(Atom<Identifier_t>(field).get()); .)
-  rcurbrack.
+    (
+        IF(checkTokenAfterIdent(_tagcolon)) Ident<key> tagcolon Type<t> 
+        | Type<t>       (. key = to_wstring(keyCounter++); .)
+        
+    )     (. typ = TypeAnnotation(TypeOperator::STRUCT, {t}); typ.fields.push_back(Atom<Identifier_t>(key).get()); .)
+    {',' (
+        IF(checkTokenAfterIdent(_tagcolon)) Ident<key> tagcolon Type<t> 
+        | Type<t>       (. key = to_wstring(keyCounter++); .)
+        
+        ) (. typ.__operands.push_back(t); typ.fields.push_back(Atom<Identifier_t>(key).get()); .)
+    } rcurbrack.
+  
   
  TDecl =  (. std::wstring ttag; TypeAnnotation t, t1; std::wstring tname, arg; std::vector<Atom<Identifier_t>> args; .)
   Ident<tname> assign "type"
   (
     "alias" Type<t>             (. root.add(move(t), Atom<Identifier_t>(tname)); .)
     | "variant" lparen Ident<arg>  (. t = TypeAnnotation(TypeOperator::VARIANT, {}); args.push_back(Atom<Identifier_t>(arg)); .)
         {',' Ident<arg>         (. args.push_back(Atom<Identifier_t>(arg)); .)
         } rparen                (. t.addFields(move(args)); root.add(move(t), Atom<Identifier_t>(tname)); .)
     
     | Ident<ttag> 
       ['('  Ident<arg>        (. args.push_back(Atom<Identifier_t>(arg));   .)
       {',' Ident<arg>         (. args.push_back(Atom<Identifier_t>(arg));   .)
       } ')']
       Type<t>                   (. t.addBindings(move(args)); root.add(move(t), Atom<Identifier_t>(tname)); .)
   ) '.' 
   .
   
 ContextDecl<CodeScope * scope> =        (. Expression tag; .)
 context tagcolon 
 MetaSimpExpr<tag>                     (. scope->tags.push_back(tag); .)
 {';' MetaSimpExpr<tag>                (. scope->tags.push_back(tag); .)
 }.
 
 VDecl<CodeScope* f> =  (. std::wstring vname; Expression var, value;.)
     VarIdent<var> assign ExprTyped<value>      (. f->addDeclaration(move(var), move(value)); .)
 .
 
 //TODO forbid multiple body declaration (ExprTyped) 
 BDecl<CodeScope* scope> =  lcurbrack      (. Expression body; pushContextScope(scope);  .)
     {(IF(checkAssignment()) VDecl<scope> '.'
     | RuleContextDecl<scope>  
     | ContextDecl<scope>'.'
     | ExprTyped<body>                     (. scope->setBody(body); .)    
     )}                                    (. popContextScope(); .)      
     rcurbrack . 
 
 IfDecl<Expression& e> =     (. Expression cond; ManagedScpPtr blockTrue = root.add(new xreate::CodeScope(context.scope)); ManagedScpPtr blockFalse = root.add(new xreate::CodeScope(context.scope)); .)
 "if" '(' Expr<cond> ')'                         (. e = Expression(Operator::IF, {cond}); .)
 tagcolon ExprAnnotations<e> 
 BDecl<&*blockTrue> "else" BDecl<&*blockFalse>   (.  e.addBlock(blockTrue); e.addBlock(blockFalse); .)
 .
 
 LoopDecl<Expression& e> = 
   (. Expression eIn, eAcc, eFilters; std::wstring varEl, varAcc, contextClass; Expression tagsEl;
     ManagedScpPtr block = root.add(new xreate::CodeScope(context.scope)); .)
    "loop"
    ("map" '(' Expr<eIn> implic Ident<varEl>     (. e = Expression(Operator::MAP, {eIn}); .)
     tagcolon ExprAnnotations<tagsEl> ')' tagcolon ExprAnnotations<e> BDecl<&*block>
       (.
          e.addBindings({Atom<Identifier_t>(varEl)});
          block->addBinding(Atom<Identifier_t>(varEl), move(tagsEl)); 
          e.addBlock(block); 
       .)
 
   |"fold" 
     ("inf" '(' Expr<eAcc> implic Ident<varAcc> ')' 
         (.
                 e = Expression(Operator::FOLD_INF, {eAcc});
                 e.addBindings({Atom<Identifier_t>(varAcc)});
         .)        
      tagcolon ExprAnnotations<e> BDecl<&*block>
         (.
                 block->addBinding(Atom<Identifier_t>(varAcc), Expression());
                 e.addBlock(block); 
         .)
   
      | '(' Expr<eIn> implic Ident<varEl> tagcolon ExprAnnotations<tagsEl> ['|' Expr<eFilters> ] ',' Expr<eAcc> implic Ident<varAcc>')'
             (.
                 e = Expression(Operator::FOLD, {eIn, eAcc});
                 e.addBindings({Atom<Identifier_t>(varEl), Atom<Identifier_t>(varAcc)});
             .)
         tagcolon ExprAnnotations<e> BDecl<&*block>
             (.  
                 
                 block->addBinding(Atom<Identifier_t>(varEl), move(tagsEl));
                 block->addBinding(Atom<Identifier_t>(varAcc), Expression());
                 e.addBlock(block); 
             .)
     )
   | "context" '(' string                          (. contextClass = t->val; .)
     ')' BDecl<&*block> 
         (. e = Expression(Operator::LOOP_CONTEXT, {Expression(Atom<String_t>(std::move(contextClass)))});
             e.addBlock(block);
          .)
 ).
    
 SwitchDecl<Expression& eSwitch, SwitchKind flagSwitchKind> = (. TypeAnnotation typ; eSwitch = Expression(Operator::SWITCH, {}); Expression eCondition; Expression tag;.)
 ["switch" 
     (   "ad" "hoc" lparen Expr<eCondition> tagcolon MetaSimpExpr<tag> rparen (. eSwitch.op = Operator::SWITCH_ADHOC;
                                                                                 eSwitch.operands.push_back(eCondition); 
                                                                                 eSwitch.addTags({tag}); 
                                                                                 flagSwitchKind = SWITCH_META; .)    
         | lparen Expr<eCondition> rparen tagcolon  ExprAnnotations<eSwitch>  (. eSwitch.operands.push_back(eCondition);.)
     )
 ]
   CaseDecl<eSwitch, flagSwitchKind> {CaseDecl<eSwitch, flagSwitchKind>}
 .
   
 CaseDecl<Expression& outer, SwitchKind flagSwitchKind> = (. ManagedScpPtr scope = root.add(new xreate::CodeScope(context.scope)); Expression condition; .)
   "case" 
   ( IF(flagSwitchKind == SWITCH_META)
         lparen MetaSimpExpr<condition> rparen BDecl<&*scope>  (. Expression exprCase(Operator::CASE, {}); exprCase.addTags({condition}); exprCase.addBlock(scope); outer.addArg(move(exprCase));.)
         
     | "default" BDecl<&*scope>                    (. Expression exprCase(Operator::CASE_DEFAULT, {});       
                                                    exprCase.addBlock(scope); 
                                                    outer.operands.insert(++outer.operands.begin(), exprCase); .)
   
     | lparen CaseParams<&*scope> rparen         (. ManagedScpPtr scopeBody = root.add(new xreate::CodeScope(&*scope)); Expression exprCase(Operator::CASE, {}); .)
       BDecl<&*scopeBody>                                (. exprCase.addBlock(scope); exprCase.addBlock(scopeBody); outer.addArg(move(exprCase)); .)
  ).
 
 CaseParams<CodeScope* scope> =           (. Expression condition; Expression guard(Operator::LOGIC_AND, {}); pushContextScope(scope); .)
  ExprTyped<condition>                  (. guard.addArg(Expression(condition)); .)
    {',' ExprTyped<condition>             (. guard.addArg(Expression(condition)); .)
    }                                     (. scope->setBody(guard); popContextScope(); .)
 .
 
 IntrinsicDecl<Expression& outer>=        (. std::wstring name; .)
 "intrinsic" Ident< name>                 (. outer = Expression(Operator::CALL_INTRINSIC, {}); outer.setValue(Atom<Identifier_t>(name)); .)
 lparen [CalleeParams<outer>] rparen .
   
                               /*============================ INTERFACES ===============================*/
 Imprt<> =                           
 "import" "raw" lparen string      (. root.__rawImports.push_back(Atom<String_t>(t->val).get()); .) 
 rparen .
 
 InterfaceData<> = "interface" '('
   (   "dfa" ')'  InterfaceDFA
     | "extern-c" ')' InterfaceExternC
     | "cfa" ')' InterfaceCFA
     | "adhoc" ')' InterfaceAdhoc
     
   ).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
 
 InterfaceAdhoc<> = 
     '{' { PrefunctionSchemeDecl }  '}'.
      
 PrefunctionSchemeDecl<> =         (. TypeAnnotation typReturn; std::wstring prefName; Expression exprCases; .)
     pre function Ident<prefName> tagcolon Type<typReturn>
     lcurbrack SwitchDecl<exprCases, SWITCH_META> rcurbrack
                                   (. Expression prefData(Operator::CALL, {Atom<Identifier_t>(prefName), exprCases}); 
                                      prefData.bindType(typReturn); 
                                      root.addInterfaceData(Adhoc, move(prefData));  
                                   .).    
 
 
 InterfaceExternC<>  =   (.xreate::ExternData data; .)
   '{' {IncludeExternDecl<data> | LibExternDecl<data> } '}'
       (. root.addExternData(move(data));  .)
 .
 
 LibExternDecl<xreate::ExternData& data> =       (. std::wstring pkgname, libname; .)
   Ident<libname> assign "library" tagcolon "pkgconfig" 
   '(' string            (. pkgname = t->val; .)
   ')' '.'               (. data.addLibrary(Atom<Identifier_t>(libname), Atom<String_t>(pkgname)); .)
 . 
 
 IncludeExternDecl<xreate::ExternData& data> =   (. Expression inc; .)
   "include" StructLiteral<inc> '.'              (. data.addIncludeDecl(move(inc)); .)
 .
   
 InterfaceDFA<> = '{' { InstructDecl } '}' .
 
 InstructDecl =                        (.Operator op; Expression tag; 
                                   Expression scheme; 
                                   std::vector<Expression>& tags = scheme.operands; 
                                   tags.push_back(Expression()); /* return value */ .)
 "operator" InstructAlias<op> tagcolon '('      (.scheme.setOp(op); .)
 [
   MetaSimpExpr<tag>             (. tags.push_back(tag); .)
   {
       ',' MetaSimpExpr<tag>     (. tags.push_back(tag); .)
   }
 ] ')' [ implic MetaSimpExpr<tag>             (. tags[0] = tag; .) 
       ]                                      (. root.addDFAData(move(scheme)); .)
 '.'.
 
 InstructAlias<Operator& op> = 
 (
    "map"  (. op = Operator::MAP; .)
   | "list_range" (. op = Operator::LIST_RANGE; .)
   | "list"       (. op = Operator::LIST; .)
   | "fold"       (. op = Operator::FOLD; .)
   | "index"      (. op = Operator::INDEX; .) 
 ). 
 
 
 InterfaceCFA<> = '{' { InstructCFADecl } '}' .
 
 InstructCFADecl<> =                          (.Operator op; Expression tag; 
                                                 Expression scheme; 
                                                 std::vector<Expression>& tags = scheme.operands;  .)
 
 "operator" InstructAlias<op> tagcolon     (. scheme.setOp(op); .)
 [
   MetaSimpExpr<tag>             (. tags.push_back(tag); .)
   {
       ',' MetaSimpExpr<tag>     (. tags.push_back(tag); .)
   }
 ] '.'                           (. root.addInterfaceData(CFA, move(scheme)); .).
     
                               /*============================ METAPROGRAMMING ===============================*/
 // TagsDecl<CodeScope* f> = (. Expression tag; TagModifier mod = TagModifier::NONE; .)
 // ':' { MetaSimpExpr<tag> (. /*f.addTag(std::move(tag), mod); */ .)
 // }.
 
 
 FnTag<Function* f> = (. Expression tag; TagModifier mod = TagModifier::NONE; .)
 MetaSimpExpr<tag>
 ['-' TagMod<mod>] (. f->addTag(std::move(tag), mod); .).
 
 TagMod<TagModifier& mod> = 
 (  "assert" (. mod = TagModifier::ASSERT; .)
  | "require" (. mod = TagModifier::REQUIRE; .)
 ).
  
 RuleDecl<> =
 "rule" tagcolon         		(. RuleArguments args; RuleGuards guards; DomainAnnotation typ; std::wstring arg; .)
 '(' Ident<arg> tagcolon Domain<typ>  	(. args.add(arg, typ); .)
 {',' Ident<arg> tagcolon Domain<typ>  	(. args.add(arg, typ); .)
 } ')'
 ["case" RGuard<guards> {',' RGuard<guards>}]
 '{' RBody<args, guards> '}' .    	
 
 /* - TODO use RGuard for guards-*/
 RuleContextDecl<CodeScope* scope> =     (.Expression eHead, eGuards, eBody; .)
 "rule" "context" tagcolon MetaSimpExpr<eHead>
 "case" lparen MetaSimpExpr<eGuards> rparen
 '{' MetaSimpExpr<eBody> '}'             (.scope->contextRules.push_back(Expression(Operator::CONTEXT_RULE, {eHead, eGuards, eBody})); .).
 
 Domain<DomainAnnotation& dom> = 
 (
   "function"  				(. dom = DomainAnnotation::FUNCTION; .)
   | "variable"    			(. dom = DomainAnnotation::VARIABLE; .)
 ).
 
 RGuard<RuleGuards& guards>=          (. Expression e; .)
 MetaExpr<e>                       (. guards.add(std::move(e)); .).
 
 MetaExpr<Expression& e>=            (.Operator op; Expression e2; .)
 MetaExpr2<e>
 [MetaOp<op> MetaExpr2<e2>           (. e = Expression(op, {e, e2}); .)
 ].
 
 MetaExpr2<Expression& e>=
 (
 '(' MetaExpr<e> ')'
 | MetaSimpExpr<e>
 ).
 
 MetaSimpExpr<Expression& e>=      (. std::wstring i1, infix; Expression e2; .)
 ( '-' MetaSimpExpr<e2>            (. e = Expression(Operator::NEG, {e2}); .)
 | IF(checkParametersList()) Ident<i1>   (. e = Expression(Operator::CALL, {Expression(Atom<Identifier_t>(i1))}); .)
 '(' [ MetaCalleeParams<e> ] ')'
 | IF(checkInfix()) Ident<i1> Ident<infix> MetaSimpExpr<e2>                                       
                                         (. e = Expression(Operator::CALL, {Expression(Atom<Identifier_t>(infix))});
                                            e.addArg(Expression(Atom<Identifier_t>(i1)));
                                            e.addArg(std::move(e2));
                                         .)
 | Ident<i1>                             (. e = Expression(Atom<Identifier_t>(i1)); .)
 ).
 
 MetaCalleeParams<Expression& e> = (. Expression e2; .)
   MetaSimpExpr<e2>	     	(. e.addArg(Expression(e2)); .)
   {',' MetaSimpExpr<e2>		(. e.addArg(Expression(e2)); .)
   }.
 
 RBody<const RuleArguments& args, const RuleGuards& guards> =
                                   (. Expression e; std::wstring msg; .)
  "warning" MetaExpr<e> ["message" string (. msg = t->val; .)
 ]                                 (. root.add(new RuleWarning(RuleArguments(args), RuleGuards(guards), std::move(e), Atom<String_t>(msg))); .)
  .
 
 MetaOp< Operator& op> =
  implic                          (. op = Operator::IMPL; .)
 .
 
         /*============================ Expressions ===============================*/
 ExprAnnotations<Expression& e> = (. TypeAnnotation typ; std::list<Expression> tags; Expression tag; e.tags.clear();.)
 Type<typ>                    (. e.bindType(move(typ)); .)
   {';' MetaSimpExpr<tag>     (. tags.push_back(tag); .)
   }                          (. e.addTags(tags); .)
 .
   
 ExprTyped<Expression&e> = Expr<e> [tagcolon ExprAnnotations<e>].
 
 Expr< Expression& e>         (. Operator op; Expression e2; .)
 = ExprArithmAdd<e>		 
   [ RelOp<op>
     ExprArithmAdd<e2>      (. e = Expression(op, {e, e2});  .)
   ].
 
 ExprArithmAdd< Expression& e>=      (. Operator op; Expression e2; .)
   ExprArithmMul< e>
   [ AddOp< op>
     ExprArithmAdd< e2>         (. e = Expression(op, {e, e2});.)
   ].
 
 ExprArithmMul< Expression& e>         (. Operator op; Expression e2; .)
 = ExprPostfix< e>
   [ MulOp< op>
     ExprArithmMul< e2>        (. e = Expression(op, {e, e2}); .)
   ].
 
 ExprPostfix<Expression& e> 
 = Term<e> 
   [lbrack                    (. e = Expression(Operator::INDEX, {e}); .)
     CalleeParams<e> rbrack   
   ].
 
 
 Term< Expression& e>       (. std::wstring name; e = Expression(); .)
 =                        
   (IF (checkParametersList()) Ident< name> 
                                     (. e = Expression(Operator::CALL, {Atom<Identifier_t>(name)}); .)
   '(' [CalleeParams<e>] ')'
   | VarIdent<e>                     (. recognizeIdentifier(e); .)
   | ListLiteral<e>                  (. /* tuple */.)    
   | StructLiteral<e>                (. /* struct */.)
   | LoopDecl<e>
   | IfDecl<e>   
   | SwitchDecl<e, SWITCH_NORMAL>
   | AdhocDecl<e>
   | IntrinsicDecl<e>
   | "true"                          (. e = Expression(Atom<Number_t>(1)); e.bindType(TypePrimitive::Bool); .)
   | "false"                         (. e = Expression(Atom<Number_t>(0)); e.bindType(TypePrimitive::Bool); .)
   | number                          (. e = Expression(Atom<Number_t>(t->val)); .)
   | string                          (. e = Expression(Atom<String_t>(t->val)); .)
   | '-' Term<e>                     (. e = Expression(Operator::NEG, {e}); .)
   | '(' ExprTyped<e> ')'  
   ).
   
-StructLiteral<Expression& e> =                     (. std::wstring key; Expression val; std::list<Atom<Identifier_t>> keys; .)
-  '{' Ident<key> '=' Expr<val>                    (. keys.push_back(Atom<Identifier_t>(key)); e = Expression(Operator::LIST_NAMED, {val}); .)
-  {',' Ident<key> '=' Expr<val>                 (.e.addArg(Expression(val)); keys.push_back(Atom<Identifier_t>(key)); .)
-  } '}'                                         (. e.addBindings(keys.begin(), keys.end()); .)
+StructLiteral<Expression& e> =                     (. std::wstring key; Expression val; std::list<Atom<Identifier_t>> keys; size_t keyCounter=0; .)
+  lcurbrack 
+        (IF(checkTokenAfterIdent(_assign)) Ident<key> '=' Expr<val>
+        | Expr<val>                                (. key = to_wstring(keyCounter++); .)
+        )                                          (. keys.push_back(Atom<Identifier_t>(key)); e = Expression(Operator::LIST_NAMED, {val}); .)
+  {',' (IF(checkTokenAfterIdent(_assign)) Ident<key> '=' Expr<val>
+        | Expr<val>                                (. key = to_wstring(keyCounter++); .)
+       )                                           (. e.addArg(Expression(val)); keys.push_back(Atom<Identifier_t>(key)); .)
+  } rcurbrack                                      (. e.addBindings(keys.begin(), keys.end()); .)
   .
   
 ListLiteral<Expression& e> =  (. Expression eFrom, eTo; .)
 '['                                                             
 [ Expr<eFrom>                                                   (. e.addArg(Expression(eFrom)); .)
 (".."  Expr<eTo>                                                (. e.addArg(Expression(eTo)); e.setOp(Operator::LIST_RANGE); .)
  |{',' Expr<eFrom>                                              (. e.addArg(Expression(eFrom)); .)
 }                                                               (. e.setOp(Operator::LIST); .) 
 ) ] ']'.
 
 AdhocDecl<Expression& e> = (. Expression command; .)
 "ad" "hoc" MetaSimpExpr<command>       (. AdhocExpression exprAdhoc; exprAdhoc.setCommand(command); e = exprAdhoc; .).
 
 CalleeParams<Expression& e> = (. Expression e2; .)
   ExprTyped<e2>		(. e.addArg(Expression(e2)); .)
   {',' ExprTyped<e2> 		(. e.addArg(Expression(e2)); .)
   }.
 
 AddOp< Operator& op>
 =                        (. op = Operator::ADD; .)
   ( '+'
   | '-'                  (. op = Operator::SUB; .)
   ).
 
 MulOp< Operator& op>
 =                        (. op = Operator::MUL; .)
   ( '*'
   | '/'                  (. op = Operator::DIV; .)
   ).
 
 RelOp< Operator& op>
 =                         (. op = Operator::EQU; .)
   ( equal
   | (ne1 | ne2)           (. op = Operator::NE; .)
   
   | lse                   (. op = Operator::LSE; .)
   | lss                   (. op = Operator::LSS; .)
   
   | gte                   (. op = Operator::GTE; .)
   | gtr                   (. op = Operator::GTR; .)
   
   ).
   
 END Xreate.
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index e59b682..3e5d30a 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -1,219 +1,220 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(xreate)
 cmake_policy(SET CMP0022 NEW)
 
 message("MODULES" ${CMAKE_MODULE_PATH})
 
 #       LLVM
 #======================
 FIND_PACKAGE (LLVM REQUIRED)
 set(LLVM_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message("LLVM LIB PATH:" ${LLVM_LIBRARY_DIRS})
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
 INCLUDE_DIRECTORIES(${LLVM_INCLUDE_DIRS})
 message(STATUS "INCLUDE DIR: ${LLVM_INCLUDE_DIRS}")
 
 add_definitions(${LLVM_DEFINITIONS})
 message("LLVM DEFS: " ${LLVM_DEFINITIONS})
 
 llvm_map_components_to_libnames(LLVM_LIBS core nativecodegen native executionengine mcjit support option)
 message("LLVM LIBS: " ${LLVM_LIBS})
 
 
 
 #       CLANG
 #======================
 set(CLANG_LIBS
 	clangCodeGen 
 	clangASTMatchers
 	clangQuery
 	clangTooling
 	clangFrontend
 	clangSerialization
 	clangDriver
 	clangParse
 	clangSema
 	clangAnalysis
 	clangAST
 	clangEdit
 	clangLex
 	clangBasic	
 )
 
 
 
 #       POTASSCO
 #======================
 set(POTASSCO_PATH "/opt/potassco/clingo" CACHE PATH "Path to potassco sources")
 set(POTASSCO_INCLUDE_PATH
     ${POTASSCO_PATH}/libgringo
     ${POTASSCO_PATH}/libclasp
     ${POTASSCO_PATH}/libclingo
     ${POTASSCO_PATH}/libprogram_opts
     ${POTASSCO_PATH}/liblp
 )
 INCLUDE_DIRECTORIES(${POTASSCO_INCLUDE_PATH})
 set(LIBCLASP_LIBS
     clingo
     clasp
     gringo
     program_opts
     reify
     lp
 )
 message("CLASP LIBS: " ${LIBCLASP_LIBS})
 
 
 
 #       OTHER DEPENDENCIES
 #===========================
 set(JEAYESON_INCLUDE_PATH
     ${CMAKE_HOME_DIRECTORY}/../vendors/jeayeson/include/
 )
 INCLUDE_DIRECTORIES(${JEAYESON_INCLUDE_PATH})
 
 
 
 #       COCO
 #===========================
 
 set(COCO_EXECUTABLE "" CACHE PATH "Path to coco executable")
 set(COCO_FRAMES_PATH "" CACHE PATH "Path to coco frames")
 
 set(COCO_GRAMMAR_PATH ${CMAKE_HOME_DIRECTORY}/../coco/)
 set(COCO_SOURCE_FILES 
         ${COCO_GRAMMAR_PATH}/Parser.cpp
         ${COCO_GRAMMAR_PATH}/Scanner.cpp)
 INCLUDE_DIRECTORIES(${COCO_GRAMMAR_PATH})
 
 add_custom_command(OUTPUT ${COCO_SOURCE_FILES}
     COMMAND ${COCO_GRAMMAR_PATH}/gen-grammar ${COCO_EXECUTABLE} ${COCO_FRAMES_PATH}
     WORKING_DIRECTORY ${COCO_GRAMMAR_PATH}
     MAIN_DEPENDENCY ${COCO_GRAMMAR_PATH}/xreate.ATG
 )
 message(STATUS "COCO GRAMMAR BUILD STATUS:" ${COCO_OUTPUT})
 
 
 
 #       XREATE
 #======================
 set(SOURCE_FILES
+    analysis/typeinference.cpp
     compilation/operators.cpp
     compilation/transformations.cpp
     compilation/transformersaturation.cpp
     pass/compilepass.cpp 
     pass/dfapass.cpp 
     analysis/dfagraph.cpp
     
     pass/versionspass.cpp
     compilation/targetinterpretation.cpp
         
     attachments.cpp
     ast.cpp
     
      ExternLayer.cpp 
 
      analysis/cfagraph.cpp
      
      analysis/aux.cpp
      compilation/containers.cpp
      compilation/advanced.cpp
 
      clasplayer.cpp
      compilation/latecontextcompiler2.cpp
      query/context.cpp
      
      llvmlayer.cpp 
      utils.cpp
      passmanager-bare.cpp
      passmanager-full.cpp
      pass/abstractpass.cpp 
      
      pass/cfapass.cpp
      pass/adhocpass.cpp
      contextrule.cpp
      query/containers.cpp
  	 pass/interpretationpass.cpp
      analysis/DominatorsTreeAnalysisProvider.cpp
      serialization/expressionserializer.cpp
 )
 
 set(XREATE_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/
 )
 
 INCLUDE_DIRECTORIES(${XREATE_INCLUDE_DIRS})
 
 set(XREATE_PRIVATE_INCLUDE_DIRS
     ${XREATE_INCLUDE_DIRS}
     ${COCO_GRAMMAR_PATH}
     ${JEAYESON_INCLUDE_PATH}
     ${LLVM_INCLUDE_DIRS}
     ${POTASSCO_INCLUDE_PATH}
 )
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${COCO_SOURCE_FILES})
 
 target_link_libraries(${PROJECT_NAME})
 
 
 target_include_directories(${PROJECT_NAME} INTERFACE 
     ${XREATE_INCLUDE_DIRS}
     ${COCO_GRAMMAR_PATH}
     ${JEAYESON_INCLUDE_PATH}
     ${LLVM_INCLUDE_DIRS}
     ${POTASSCO_INCLUDE_PATH}
 )
 
 get_directory_property(DEFINITIONS_ALL DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMPILE_DEFINITIONS)
 message("definitions all: " ${DEFINITIONS_ALL})
 target_compile_definitions(${PROJECT_NAME} INTERFACE ${DEFINITIONS_ALL})
 
 get_directory_property(COMPILATION_OPTIONS_ALL DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMPILE_OPTIONS)
 message("compilations all: " ${COMPILATION_OPTIONS_ALL})
 target_compile_options(${PROJECT_NAME} INTERFACE ${COMPILATION_OPTIONS_ALL})
 
 SET_PROPERTY(TARGET ${PROJECT_NAME} PROPERTY
     INTERFACE_LINK_LIBRARIES ${LIBCLASP_LIBS} ${CLANG_LIBS} ${LLVM_LIBS}    tbb
 )
 
 #${CLANG_LIBS}
 
 
 #set (LINK_INTERFACE_LIBRARIES "")
 
 # FUNCTION(PREPEND var prefix)
 #    SET(listVar "")
 #    FOREACH(f ${ARGN})
 #       LIST(APPEND listVar "${prefix}/${f}")
 #    ENDFOREACH(f)
 #    SET(${var} "${listVar}" PARENT_SCOPE)
 # ENDFUNCTION(PREPEND)
 
 #set(COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "-j4")
 #cotire(xreate)
 
 
 # MACRO (ADD_PCH_RULE  _header_filename _src_list)
 # 	SET(_gch_filename "${_header_filename}.gch")
 # 	LIST(APPEND ${_src_list} ${_gch_filename})
 # 	SET (_args ${CMAKE_CXX_FLAGS})
 # 	LIST(APPEND _args -c ${_header_filename} -o ${_gch_filename})
 # 	GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES)
 # 	foreach (_inc ${DIRINC})
 # 		LIST(APPEND _args "-I" ${_inc})
 # 	endforeach(_inc ${DIRINC})
 # 	SEPARATE_ARGUMENTS(_args)
 # 	add_custom_command(OUTPUT ${_gch_filename}
 # 		   COMMAND rm -f ${_gch_filename}
 # 		   COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_args}
 # 			    DEPENDS ${_header_filename})
 # ENDMACRO(ADD_PCH_RULE _header_filename _src_list)
 
 # ADD_PCH_RULE (${CMAKE_HOME_DIRECTORY}/src/ast.h SOURCE_FILES)
 # ADD_PCH_RULE (${CMAKE_HOME_DIRECTORY}/src/llvmlayer.h SOURCE_FILES)
 # ADD_PCH_RULE (${CMAKE_HOME_DIRECTORY}/src/clasplayer.h SOURCE_FILES)
 # ADD_PCH_RULE (${CMAKE_HOME_DIRECTORY}/src/pass/abstractpass.h SOURCE_FILES)
diff --git a/cpp/src/analysis/typeinference.cpp b/cpp/src/analysis/typeinference.cpp
new file mode 100644
index 0000000..564650c
--- /dev/null
+++ b/cpp/src/analysis/typeinference.cpp
@@ -0,0 +1,55 @@
+/*
+ * typeinference.cpp
+ *
+ * Author: pgess <v.melnychenko@xreate.org>
+ * Created on April 16, 2017, 10:13 AM
+ */
+
+#include "typeinference.h"
+#include "llvmlayer.h"
+
+#include "llvm/IR/Function.h"
+#include "llvm/IR/DerivedTypes.h"
+
+namespace xreate {namespace analysis {namespace typeinference {
+
+llvm::Value*
+doAutomaticTypeConversion(llvm::Value* source, llvm::Type* tyTarget, llvm::IRBuilder<>& builder){
+    if (tyTarget->isIntegerTy() && source->getType()->isIntegerTy())
+    {
+            llvm::IntegerType* tyTargetInt = llvm::dyn_cast<llvm::IntegerType>(tyTarget);
+            llvm::IntegerType* tySourceInt = llvm::dyn_cast<llvm::IntegerType>(source->getType());
+
+            if (tyTargetInt->getBitWidth() < tySourceInt->getBitWidth()){
+                    return builder.CreateCast(llvm::Instruction::Trunc, source, tyTarget);
+            }
+
+            if (tyTargetInt->getBitWidth() > tySourceInt->getBitWidth()){
+                    return builder.CreateCast(llvm::Instruction::SExt, source, tyTarget);
+            }
+    }
+
+    if (source->getType()->isIntegerTy() && tyTarget->isFloatingPointTy()){
+        return builder.CreateCast(llvm::Instruction::SIToFP, source, tyTarget);
+    }
+
+    return source;
+}
+
+ExpandedType
+getType(const Expression& expression, const AST& ast){
+    if (expression.type.isValid()){
+            return ast.expandType(expression.type);
+    }
+
+    if (expression.__state == Expression::IDENT){
+        Symbol s = Attachments::get<Symbol>(expression);
+        return getType(CodeScope::getDeclaration(s), ast);
+    }
+
+    assert(false && "Type can't be determined for an expression");
+}
+
+
+
+} } }
\ No newline at end of file
diff --git a/cpp/src/analysis/typeinference.h b/cpp/src/analysis/typeinference.h
new file mode 100644
index 0000000..621a5a7
--- /dev/null
+++ b/cpp/src/analysis/typeinference.h
@@ -0,0 +1,27 @@
+/* 
+ * File:   typeinference.h
+ * Author: pgess <v.melnychenko@xreate.org>
+ *
+ * Created on April 16, 2017, 10:17 AM
+ */
+
+#ifndef TYPEINFERENCE_H
+#define TYPEINFERENCE_H
+
+#include "ast.h"
+#include "llvm/IR/IRBuilder.h"
+
+namespace llvm {
+    class Value;
+    class Type;
+};
+
+namespace xreate {namespace analysis {namespace typeinference {
+    
+llvm::Value* doAutomaticTypeConversion(llvm::Value* source, llvm::Type* tyTarget, llvm::IRBuilder<>& builder);
+ExpandedType getType(const Expression& expression, const AST& ast);    
+
+} } } //namespace xreate
+
+#endif /* TYPEINFERENCE_H */
+
diff --git a/cpp/src/ast.cpp b/cpp/src/ast.cpp
index 09498dc..b4a981b 100644
--- a/cpp/src/ast.cpp
+++ b/cpp/src/ast.cpp
@@ -1,929 +1,907 @@
 #include "ast.h"
 #include "ExternLayer.h"
+#include "analysis/typeinference.h"
+
 #include <stdexcept>
 #include <iostream>
 
 namespace std{
 
     std::size_t
     hash<xreate::ScopedSymbol>::operator()(xreate::ScopedSymbol const& s) const
     {return s.id ^ (s.version << 2);}
 
     bool
     equal_to<xreate::ScopedSymbol>::operator()(const xreate::ScopedSymbol& __x, const xreate::ScopedSymbol& __y) const
     { return __x.id == __y.id && __x.version == __y.version; }
 }
 
 using namespace std;
 
 namespace xreate {
 
 Atom<Identifier_t>::Atom(const std::wstring& value) {
     __value = wstring_to_utf8(value);
 }
 
 Atom<Identifier_t>::Atom(std::string && name) : __value(name)
 {}
 
 const std::string&
 Atom<Identifier_t>::get() const {
     return __value;
 }
 
 Atom<Number_t>::Atom(wchar_t* value) {
     //DEBT reconsider number literal recognition
     __value = wcstol(value, 0, 10);
 }
 
 Atom<Number_t>::Atom(int value)
 : __value(value) {
 }
 
 double
 Atom<Number_t>::get()const {
     return __value;
 }
 
 Atom<String_t>::Atom(const std::wstring& value) {
     assert(value.size() >=2);
     __value = wstring_to_utf8(value.substr(1, value.size() -2));
 }
 
 const std::string&
 Atom<String_t>::get() const {
     return __value;
 }
 
     class ExpressionHints {
     public:
 
         static bool
         isStringValueValid(const Expression& e) {
             switch (e.__state) {
                 case Expression::INVALID:
                     assert(false);
 
                 case Expression::IDENT:
                 case Expression::STRING:
                     return true;
 
                 case Expression::NUMBER:
                 case Expression::BINDING:
                 case Expression::VARIANT:
                     return false;
 
                 case Expression::COMPOUND:
                 {
                     switch (e.op) {
                         case Operator::CALL:
                             return true;
 
                         default: return false;
                     }
                 }
             }
 
             return false;
         }
 
         static bool
         isDoubleValueValid(const Expression& e) {
             switch (e.__state) {
                 case Expression::NUMBER:
                 case Expression::VARIANT:
                     return true;
 
                 case Expression::INVALID:
                     assert(false);
 
                 case Expression::IDENT:
                 case Expression::STRING:
                 case Expression::COMPOUND:
                 case Expression::BINDING:
                     return false;
             }
 
             return false;
         }
     };
 
     class TypesResolver {
     private:
         const AST* ast;
         std::map<std::string, TypeAnnotation> scope;
         std::map<TypeAnnotation, int> signatures;
 
         ExpandedType expandType(const TypeAnnotation &t, const std::vector<TypeAnnotation> &args = std::vector<TypeAnnotation>()) {
             return TypesResolver(ast, scope, signatures)(t, args);
         }
 
         std::vector<TypeAnnotation>
         expandOperands(const std::vector<TypeAnnotation>& operands) {
             std::vector<TypeAnnotation> pack;
 
             pack.reserve(operands.size());
             std::transform(operands.begin(), operands.end(), std::inserter(pack, pack.end()),
                     [this](const TypeAnnotation & t) {
                         return expandType(t);
                     });
 
             return pack;
         }
 
     public:
 
         TypesResolver(const AST* root, const std::map<std::string, TypeAnnotation>& scopeOuter = std::map<std::string, TypeAnnotation>(),
                 std::map<TypeAnnotation, int> signaturesOuter = std::map<TypeAnnotation, int>())
         : ast(root), scope(scopeOuter), signatures(signaturesOuter) {
         }
 
         ExpandedType
         operator()(const TypeAnnotation &t, const std::vector<TypeAnnotation> &args = std::vector<TypeAnnotation>()) {
             //assert(args.size() == t.bindings.size()); // invalid number of arguments
             for (size_t i = 0; i < args.size(); ++i) {
                 scope[t.bindings.at(i)] = args.at(i);
             }
 
             switch (t.__operator) {
                 case TypeOperator::ARRAY:
                 {
                     assert(t.__operands.size() == 1);
 
                     Expanded<TypeAnnotation> elTy = expandType(t.__operands.at(0));
                     return ExpandedType(TypeAnnotation(tag_array, elTy, 0));
                 }
 
                 case TypeOperator::STRUCT:
                 {
                     assert(t.__operands.size());
 
-                    std::vector<TypeAnnotation>&& pack = expandOperands(t.__operands);
-                    auto tnew = TypeAnnotation(TypeOperator::STRUCT, move(pack));
-                    tnew.fields = t.fields;
+                    std::vector<TypeAnnotation>&& packOperands = expandOperands(t.__operands);
+                    auto typNew = TypeAnnotation(TypeOperator::STRUCT, move(packOperands));
+                    typNew.fields = t.fields;
 
-                    return ExpandedType(move(tnew));
+                    return ExpandedType(move(typNew));
                 };
 
                 case TypeOperator::CALL:
                 {
                     std::string alias = t.__valueCustom;
 
                     //find in local scope:
                     TypeAnnotation ty;
                     if (scope.count(alias)) {
                         ty = scope.at(alias);
 
                     } else if (ast->__indexTypeAliases.count(alias)) {
                         ty = ast->__indexTypeAliases.at(alias);
 
                     } else {
                         assert(false && "Undefined or external type");
                     }
 
                     std::vector<TypeAnnotation>&& operands = expandOperands(t.__operands);
                     TypeAnnotation signature(TypeOperator::CALL, move(operands));
                     signature.__valueCustom = alias;
 
                     if (signatures.count(signature)) {
                         auto link = TypeAnnotation(TypeOperator::LINK,{});
                         link.conjuctionId = signatures.at(signature);
 
                         return ExpandedType(move(link));
                     }
 
                     int cid = signatures.size();
                     signatures[signature] = cid;
                     TypeAnnotation tyResult = expandType(ty, operands);
                     tyResult.conjuctionId = cid;
 
                     return ExpandedType(move(tyResult));
                 };
 
                 case TypeOperator::CUSTOM:
                 {
                     std::string alias = t.__valueCustom;
 
                     /*
                     if (signatures.count(alias)) {
                         return ExpandedType(TypeAnnotation(TypeOperator::LINK, {t}));
                     }
                     signatures[alias].emplace(t);
                      */
 
                     //find in local scope:
                     if (scope.count(alias)) {
                         return expandType(scope.at(alias));
                     }
 
                     // find in general scope:
                     if (ast->__indexTypeAliases.count(alias)) {
                         return expandType(ast->__indexTypeAliases.at(t.__valueCustom));
                     }
 
                     //if type is unknown keep it as is.
                     return ExpandedType(TypeAnnotation(t));
                 };
 
                 case TypeOperator::ACCESS:
                 {
                     std::string alias = t.__valueCustom;
                     ExpandedType tyAlias = ExpandedType(TypeAnnotation());
 
                     //find in local scope:
                     if (scope.count(alias)) {
                         tyAlias = expandType(scope.at(alias));
 
                         //find in global scope:
                     } else if ((ast->__indexTypeAliases.count(alias))) {
                         tyAlias = expandType(ast->__indexTypeAliases.at(alias));
 
                     } else {
                         assert(false && "Undefined or external type");
                     }
 
                     assert(tyAlias->__operator == TypeOperator::STRUCT);
 
                     for (const string& field : t.fields) {
                         auto fieldIt = std::find(tyAlias->fields.begin(), tyAlias->fields.end(), field);
                         assert(fieldIt != tyAlias->fields.end() && "unknown field");
 
                         int fieldId = fieldIt - tyAlias->fields.begin();
                         tyAlias = expandType(tyAlias->__operands.at(fieldId));
                     }
 
                     return tyAlias;
                 }
 
-                case TypeOperator::TUPLE:
-                {
-                    assert(t.__operands.size());
-
-                    std::vector<TypeAnnotation> pack;
-                    pack.reserve(t.__operands.size());
-
-                    std::transform(t.__operands.begin(), t.__operands.end(), std::inserter(pack, pack.end()),
-                            [this](const TypeAnnotation & t) {
-                                return expandType(t);
-                            });
-
-                    return ExpandedType(TypeAnnotation(TypeOperator::TUPLE, move(pack)));
-                }
-
                 case TypeOperator::VARIANT:
                 {
                     return ExpandedType(TypeAnnotation(t));
                 }
 
                 case TypeOperator::NONE:
                 {
                     return ExpandedType(TypeAnnotation(t));
                 }
 
                 default:
                     assert(false);
             }
 
             assert(false);
             return ExpandedType(TypeAnnotation());
         }
     };
 
     TypeAnnotation::TypeAnnotation()
         : __operator(TypeOperator::NONE), __value(TypePrimitive::Invalid)
     {}
 
     TypeAnnotation::TypeAnnotation(TypePrimitive typ)
     : __value(typ) {
     }
 
     TypeAnnotation::TypeAnnotation(TypeOperator op, std::initializer_list<TypeAnnotation> operands)
     : __operator(op), __operands(operands) {
 
     }
 
     TypeAnnotation::TypeAnnotation(TypeOperator op, std::vector<TypeAnnotation>&& operands)
     : __operator(op), __operands(operands) {
     }
 
     TypeAnnotation::TypeAnnotation(llvm_array_tag, TypeAnnotation typ, int size)
     : TypeAnnotation(TypeOperator::ARRAY,{typ}) {
         __size = size;
     }
 
     bool
     TypeAnnotation::isValid() const{
         return !(__value == TypePrimitive::Invalid && __operator == TypeOperator::NONE);
     }
 
     bool
     TypeAnnotation::operator<(const TypeAnnotation& t) const {
         if (__operator != t.__operator) return __operator < t.__operator;
 
         if (__operator == TypeOperator::NONE)
             return __value < t.__value;
 
         if (__operator == TypeOperator::CALL || __operator == TypeOperator::CUSTOM || __operator == TypeOperator::ACCESS) {
             if (__valueCustom != t.__valueCustom)
                 return __valueCustom < t.__valueCustom;
         }
 
         return __operands < t.__operands;
     }
 
     /*
     TypeAnnotation (struct_tag, std::initializer_list<TypeAnnotation>)
     {}
      */
 
     void
     TypeAnnotation::addBindings(std::vector<Atom<Identifier_t>>&& params) {
         bindings.reserve(bindings.size() + params.size());
 
         std::transform(params.begin(), params.end(), std::inserter(bindings, bindings.end()),
                 [](const Atom<Identifier_t>& ident) {
                     return ident.get(); });
     }
 
     void
     TypeAnnotation::addFields(std::vector<Atom<Identifier_t>>&& listFields) {
         fields.reserve(fields.size() + listFields.size());
 
         std::transform(listFields.begin(), listFields.end(), std::inserter(fields, fields.end()),
                 [](const Atom<Identifier_t>& ident) {
                     return ident.get(); });
     }
 
     unsigned int Expression::nextVacantId = 0;
 
     Expression::Expression(const Atom<Number_t>& number)
     : Expression() {
         __state=NUMBER; op=Operator::NONE; __valueD=number.get();
     }
 
     Expression::Expression(const Atom<String_t>& a)
     : Expression(){
         __state=STRING; op=Operator::NONE; __valueS=a.get();
     }
 
     Expression::Expression(const Atom<Identifier_t> &ident)
     : Expression() {
         __state=IDENT; op=Operator::NONE; __valueS=ident.get();
     }
 
     Expression::Expression(const Operator &oprt, std::initializer_list<Expression> params)
     : Expression() {
         __state=COMPOUND; op=oprt;
 
         if (op == Operator::CALL) {
             assert(params.size() > 0);
             Expression arg = *params.begin();
 
             assert(arg.__state == Expression::IDENT);
             __valueS = std::move(arg.__valueS);
 
             operands.insert(operands.end(), params.begin() + 1, params.end());
             return;
         }
 
         operands.insert(operands.end(), params.begin(), params.end());
     }
 
     void
     Expression::setOp(Operator oprt) {
         op = oprt;
 
         switch (op) {
             case Operator::NONE:
                 __state = INVALID;
                 break;
 
             default:
                 __state = COMPOUND;
                 break;
         }
     }
 
     void
     Expression::addArg(Expression &&arg) {
         operands.push_back(arg);
     }
 
     void
     Expression::addTags(const std::list<Expression> tags) const{
         std::transform(tags.begin(), tags.end(), std::inserter(this->tags, this->tags.end()),
             [](const Expression& tag){
                 return make_pair(tag.getValueString(), tag);
         });
     }
 
     void
     Expression::addBindings(std::initializer_list<Atom<Identifier_t>> params) {
         addBindings(params.begin(), params.end());
     }
 
     void
     Expression::bindType(TypeAnnotation t) {
         type = move(t);
     }
 
     void
     Expression::addBlock(ManagedScpPtr scope) {
         blocks.push_back(scope.operator->());
     }
 
     const std::vector<Expression>&
     Expression::getOperands() const {
         return operands;
     }
 
     double
     Expression::getValueDouble() const {
         return __valueD;
     }
 
     const std::string&
     Expression::getValueString() const {
         return __valueS;
     }
 
     void
     Expression::setValue(const Atom<Identifier_t>&& v) {
         __valueS = v.get();
     }
 
     void Expression::setValueDouble(double value) {
         __valueD = value;
     }
 
     bool
     Expression::isValid() const {
         return (__state != INVALID);
     }
 
     bool
     Expression::isDefined() const {
         return (__state != BINDING);
     }
 
     Expression::Expression()
     : __state(INVALID), op(Operator::NONE), id(nextVacantId++)
     {    }
 
     AST::AST() {
         Attachments::init<VariableVersion>();
         Attachments::init<Symbol>();
     }
 
     void
     AST::addInterfaceData(const ASTInterface& interface, Expression&& data) {
         __interfacesData.emplace(interface, move(data));
     }
 
     void
     AST::addDFAData(Expression &&data) {
         __dfadata.push_back(data);
     }
 
     void
     AST::addExternData(ExternData &&data) {
         __externdata.insert(__externdata.end(), data.entries.begin(), data.entries.end());
     }
 
     void
     AST::add(Function* f) {
         __functions.push_back(f);
         __indexFunctions.emplace(f->getName(), __functions.size() - 1);
     }
 
     void
     AST::add(MetaRuleAbstract *r) {
         __rules.push_back(r);
     }
 
     void
     AST::add(TypeAnnotation t, Atom<Identifier_t> alias) {
         if (t.__operator == TypeOperator::VARIANT) {
             for (int i = 0, size = t.fields.size(); i < size; ++i) {
                 __dictVariants.emplace(t.fields[i], make_pair(t, i));
             }
         }
 
         __indexTypeAliases.emplace(alias.get(), move(t));
     }
 
     ManagedScpPtr
     AST::add(CodeScope* scope) {
         this->__scopes.push_back(scope);
         return ManagedScpPtr(this->__scopes.size() - 1, &this->__scopes);
     }
 
     std::string
     AST::getModuleName() {
         const std::string name = "moduleTest";
 
         return name;
     }
 
     ManagedPtr<Function>
     AST::findFunction(const std::string& name) {
         int count = __indexFunctions.count(name);
         if (!count) {
             return ManagedFnPtr::Invalid();
         }
 
         assert(count == 1);
 
         auto range = __indexFunctions.equal_range(name);
         return ManagedPtr<Function>(range.first->second, &this->__functions);
     }
 
     std::list<ManagedFnPtr>
     AST::getAllFunctions() const {
         const size_t size = __functions.size();
 
         std::list<ManagedFnPtr> result;
         for (size_t i = 0; i < size; ++i) {
             result.push_back(ManagedFnPtr(i, &this->__functions));
         }
 
         return result;
     }
 
     //TASK select default  specializations
 
     std::list<ManagedFnPtr>
     AST::getFunctionVariants(const std::string& name) const {
         auto functions = __indexFunctions.equal_range(name);
 
         std::list<ManagedFnPtr> result;
         std::transform(functions.first, functions.second, inserter(result, result.end()),
                 [this](auto f) {
                     return ManagedFnPtr(f.second, &this->__functions);
                 });
 
         return result;
     }
 
     template<>
     ManagedPtr<Function>
     AST::begin<Function>() {
         return ManagedPtr<Function>(0, &this->__functions);
     }
 
     template<>
     ManagedPtr<CodeScope>
     AST::begin<CodeScope>() {
         return ManagedPtr<CodeScope>(0, &this->__scopes);
     }
 
     template<>
     ManagedPtr<MetaRuleAbstract>
     AST::begin<MetaRuleAbstract>() {
         return ManagedPtr<MetaRuleAbstract>(0, &this->__rules);
     }
 
     Expanded<TypeAnnotation>
     AST::expandType(const TypeAnnotation &t) const {
         return TypesResolver(this)(t);
     }
 
     Expanded<TypeAnnotation>
     AST::findType(const std::string& name) {
         // find in general scope:
         if (__indexTypeAliases.count(name))
             return expandType(__indexTypeAliases.at(name));
 
         //if type is unknown keep it as is.
         TypeAnnotation t(TypeOperator::CUSTOM,{});
         t.__valueCustom = name;
         return ExpandedType(move(t));
     }
 
     ExpandedType
     AST::getType(const Expression& expression){
-        if (expression.type.isValid()){
-            return expandType(expression.type);
-        }
-
-        if (expression.__state == Expression::IDENT){
-            Symbol s = Attachments::get<Symbol>(expression);
-            return getType(CodeScope::getDeclaration(s));
-        }
-
-        assert(false && "Type can't be determined for an expression");
+        return analysis::typeinference::getType(expression, *this);
     }
 
     bool
     AST::recognizeVariantIdentifier(Expression& identifier) {
         assert(identifier.__state == Expression::IDENT);
 
         std::string variant = identifier.getValueString();
         if (!__dictVariants.count(variant)) {
             return false;
         }
 
         auto record = __dictVariants.at(variant);
         const TypeAnnotation& typ = record.first;
 
         identifier.__state = Expression::VARIANT;
         identifier.setValueDouble(record.second);
         identifier.type = typ;
 
         return true;
     }
 
     Function::Function(const Atom<Identifier_t>& name)
     : __entry(new CodeScope(0)) {
         __name = name.get();
     }
 
     void
     Function::addTag(Expression&& tag, const TagModifier mod) {
         string name = tag.getValueString();
         __tags.emplace(move(name), move(tag));
     }
 
     const std::map<std::string, Expression>&
     Function::getTags() const {
         return __tags;
     }
 
     CodeScope*
     Function::getEntryScope() const {
         return __entry;
     }
 
     void
     Function::addBinding(Atom <Identifier_t>&& name, Expression&& argument) {
         __entry->addBinding(move(name), move(argument));
     }
 
     const std::string&
     Function::getName() const {
         return __name;
     }
 
     ScopedSymbol
     CodeScope::registerIdentifier(const Expression& identifier) {
         VariableVersion version = Attachments::get<VariableVersion>(identifier, VERSION_NONE);
 
         auto result = __identifiers.emplace(identifier.getValueString(), __vCounter);
         if (result.second){
             ++__vCounter;
             return {__vCounter-1, version};
         }
 
         return {result.first->second, version};
     }
 
     bool
     CodeScope::recognizeIdentifier(const Expression& identifier) const{
         VariableVersion version = Attachments::get<VariableVersion>(identifier, VERSION_NONE);
         const std::string& name = identifier.getValueString();
 
         //search identifier in the current block
         if (__identifiers.count(name)){
             VNameId id = __identifiers.at(name);
 
             Symbol s;
             s.identifier = ScopedSymbol{id, version};
             s.scope = const_cast<CodeScope*>(this);
             Attachments::put<Symbol>(identifier, s);
 
             return true;
         }
 
         //search in the parent scope
         if (__parent)
         {
             return __parent->recognizeIdentifier(identifier);
         }
 
         return false;
     }
 
     ScopedSymbol
     CodeScope::getSymbol(const std::string& alias){
         assert(__identifiers.count(alias));
         VNameId id = __identifiers.at(alias);
 
         return {id, VERSION_NONE};
     }
 
     void
     AST::postponeIdentifier(CodeScope* scope, const Expression& id) {
         binUnrecognizedIdentifiers.emplace(scope, id);
     }
 
     void
     AST::recognizePostponedIdentifiers() {
         for(const auto& identifier: binUnrecognizedIdentifiers){
             if (!identifier.first->recognizeIdentifier(identifier.second)){
                             //exception: Ident not found
                 std::cout << "Unknown symbol: "<< identifier.second.getValueString() << std::endl;
                 assert(false && "Symbol not found");
             }
         }
     }
 
     void
     CodeScope::addBinding(Expression&& var, Expression&& argument) {
         argument.__state = Expression::BINDING;
 
         __bindings.push_back(var.getValueString());
         ScopedSymbol binding = registerIdentifier(var);
         __declarations[binding] = move(argument);
     }
 
     void
     CodeScope::addDeclaration(Expression&& var, Expression&& body) {
         ScopedSymbol s = registerIdentifier(var);
         __declarations[s] = move(body);
     }
 
     CodeScope::CodeScope(CodeScope* parent)
     : __parent(parent) {
     }
 
     CodeScope::~CodeScope() {
     }
 
     void
     CodeScope::setBody(const Expression &body) {
         __declarations[ScopedSymbol::RetSymbol] = body;
     }
 
     Expression&
     CodeScope::getBody() {
         return __declarations[ScopedSymbol::RetSymbol];
     }
 
     const Expression&
     CodeScope::getDeclaration(const Symbol& symbol) {
         CodeScope* self = symbol.scope;
         return self->getDeclaration(symbol.identifier);
     }
 
     const Expression&
     CodeScope::getDeclaration(const ScopedSymbol& symbol){
         assert(__declarations.count(symbol) && "Symbol's declaration not found");
 
         return __declarations.at(symbol);
     }
 
     void
     RuleArguments::add(const Atom<Identifier_t> &arg, DomainAnnotation typ) {
         emplace_back(arg.get(), typ);
     }
 
     void
     RuleGuards::add(Expression&& e) {
         push_back(e);
     }
 
     MetaRuleAbstract::
     MetaRuleAbstract(RuleArguments&& args, RuleGuards&& guards)
     : __args(std::move(args)), __guards(std::move(guards)) {
     }
 
     MetaRuleAbstract::~MetaRuleAbstract() {
     }
 
     RuleWarning::
     RuleWarning(RuleArguments&& args, RuleGuards&& guards, Expression&& condition, Atom<String_t>&& message)
     : MetaRuleAbstract(std::move(args), std::move(guards)), __message(message.get()), __condition(condition) {
     }
 
     RuleWarning::~RuleWarning() {
     }
 
     void
     RuleWarning::compile(ClaspLayer& layer) {
         //TODO restore addRuleWarning
         //layer.addRuleWarning(*this);
     }
 
     bool operator<(const ScopedSymbol& s1, const ScopedSymbol& s2) {
         return (s1.id < s2.id) || (s1.id==s2.id && s1.version < s2.version);
     }
 
     bool operator==(const ScopedSymbol& s1, const ScopedSymbol& s2) {
         return (s1.id == s2.id) && (s1.version == s2.version);
     }
 
     bool operator<(const Symbol& s1, const Symbol& s2) {
         return (s1.scope < s2.scope) || (s1.scope == s2.scope && s1.identifier < s2.identifier);
     }
 
     bool operator==(const Symbol& s1, const Symbol& s2) {
         return (s1.scope == s2.scope) && (s1.identifier == s2.identifier);
     }
 
     bool operator<(const Expression&a, const Expression&b) {
         if (a.__state != b.__state) return a.__state < b.__state;
         assert(a.__state != Expression::INVALID);
         switch (a.__state) {
             case Expression::IDENT:
             case Expression::STRING:
             case Expression::VARIANT:
                 return a.getValueString() < b.getValueString();
 
             case Expression::NUMBER:
                 return a.getValueDouble() < b.getValueDouble();
 
             case Expression::COMPOUND:
             {
                 assert(a.blocks.size() == 0);
                 assert(b.blocks.size() == 0);
 
                 if (a.op != b.op){
                     return a.op < b.op;
                 }
 
                 bool flagAValid = ExpressionHints::isStringValueValid(a);
                 bool flagBValid = ExpressionHints::isStringValueValid(b);
 
                 if (flagAValid != flagBValid) {
                     return flagAValid < flagBValid;
                 }
 
                 if (flagAValid){
                     if (a.getValueString() != b.getValueString()) {
                         return a.getValueString() < b.getValueString();
                     }
                 }
 
                 flagAValid = ExpressionHints::isDoubleValueValid(a);
                 flagBValid = ExpressionHints::isDoubleValueValid(b);
 
                 if (flagAValid != flagBValid) {
                     return flagAValid < flagBValid;
                 }
 
                 if (flagAValid){
                     if (a.getValueDouble() != b.getValueDouble()) {
                         return a.getValueDouble() < b.getValueDouble();
                     }
                 }
 
                 if (a.operands.size() != b.operands.size()) {
                     return (a.operands.size() < b.operands.size());
                 }
 
                 for (size_t i = 0; i < a.operands.size(); ++i) {
                     bool result = a.operands[i] < b.operands[i];
                     if (result) return true;
                 }
 
                 return false;
             }
 
             case Expression::BINDING:
             case Expression::INVALID:
                 assert(false);
         }
 
         return false;
     }
 
     bool
     Expression::operator==(const Expression& other) const {
         if (this->__state != other.__state) return false;
 
         if (ExpressionHints::isStringValueValid(*this)) {
             if (this->__valueS != other.__valueS) return false;
         }
 
         if (ExpressionHints::isDoubleValueValid(*this)) {
             if (this->__valueD != other.__valueD) return false;
         }
 
         if (this->__state != Expression::COMPOUND) {
             return true;
         }
 
         if (this->op != other.op) {
             return false;
         }
 
         if (this->operands.size() != other.operands.size()) {
             return false;
         }
 
         for (size_t i = 0; i<this->operands.size(); ++i) {
             if (!(this->operands[i] == other.operands[i])) return false;
         }
 
         assert(!this->blocks.size());
         assert(!other.blocks.size());
 
         return true;
     }
 
 const ScopedSymbol
 ScopedSymbol::RetSymbol = ScopedSymbol{0, VERSION_NONE};
 }
 
 
 
 
diff --git a/cpp/src/ast.h b/cpp/src/ast.h
index 5c8623d..8e9d085 100644
--- a/cpp/src/ast.h
+++ b/cpp/src/ast.h
@@ -1,557 +1,557 @@
 #ifndef AST_H
 #define AST_H
 
 #include "attachments.h"
 
 #include <vector>
 #include <stdlib.h>
 #include <string>
 #include <list>
 #include <unordered_map>
 #include <unordered_set>
 #include <climits>
 #include "utils.h"
 #include <algorithm>
 
 namespace llvm {
     class Value;
 }
 
 namespace xreate {
 
 struct String_t {
 };
 
 struct Identifier_t {
 };
 
 struct Number_t {
 };
 
 struct Type_t {
 };
 
 template<typename A>
 class Atom {
 };
 
 //DEBT hold for all atoms/identifiers Parser::Token data, like line:col position
 template<> class 
 Atom<Identifier_t> {
 public:
     Atom(const std::wstring& value);
     Atom(std::string && name);
     const std::string& get() const;
     
 private:
     std::string __value;
 };
 
 template<> 
 class Atom<Number_t> {
 public:
     Atom(wchar_t* value);
     Atom(int value);
     double get()const;
     
 private:
     double __value;
 };
 
 template<> 
 class Atom<String_t> {
 public:
     Atom(const std::wstring& value);
     const std::string& get() const;
 
 private:
     std::string __value;
 };
 
 enum class TypePrimitive {
     Invalid, Bool, I8, I32, I64, Num, Int, Float, String
 };
 
     enum class TypeOperator {
-        NONE, CALL, CUSTOM, VARIANT, ARRAY, TUPLE, STRUCT, ACCESS, LINK
+        NONE, CALL, CUSTOM, VARIANT, ARRAY, STRUCT, ACCESS, LINK
     };
 
     struct llvm_array_tag {
     };
 
     struct struct_tag {
     };
     const llvm_array_tag tag_array = llvm_array_tag();
     const struct_tag tag_struct = struct_tag();
 
     class TypeAnnotation {
     public:
         TypeAnnotation();
         TypeAnnotation(const Atom<Type_t>& typ);
         TypeAnnotation(TypePrimitive typ);
         TypeAnnotation(llvm_array_tag, TypeAnnotation typ, int size);
 
         TypeAnnotation(TypeOperator op, std::initializer_list<TypeAnnotation> operands);
         TypeAnnotation(TypeOperator op, std::vector<TypeAnnotation>&& operands);
         void addBindings(std::vector<Atom<Identifier_t>>&& params);
         void addFields(std::vector<Atom<Identifier_t>>&& listFields);
         bool operator<(const TypeAnnotation& t) const;
         //   TypeAnnotation (struct_tag, std::initializer_list<TypePrimitive>);
 
         bool isValid() const;
 
         TypeOperator __operator = TypeOperator::NONE;
 
         std::vector<TypeAnnotation> __operands;
         TypePrimitive __value;
         std::string __valueCustom;
         int conjuctionId = -1; //conjunction point id (relevant for recursive types)
 
         uint64_t __size = 0;
         std::vector<std::string> fields;
         std::vector<std::string> bindings;
     private:
     };
 
     enum class Operator {
         ADD, SUB, MUL, DIV,
         EQU, NE, NEG, LSS, 
         LSE, GTR, GTE, LIST, 
         LIST_RANGE, LIST_NAMED, 
         CALL, CALL_INTRINSIC, NONE, 
         IMPL/* implication */, MAP, 
         FOLD, FOLD_INF, LOOP_CONTEXT, 
         INDEX, IF, SWITCH, SWITCH_ADHOC, 
         CASE, CASE_DEFAULT, LOGIC_AND, 
         ADHOC, CONTEXT_RULE
     };
 
     class Function;
     class AST;
     class CodeScope;
     class MetaRuleAbstract;
 
     template<class Target>
     struct ManagedPtr {
 
         static ManagedPtr<Target> Invalid() {
             return ManagedPtr<Target>();
         }
 
         ManagedPtr() : __storage(0) {
         }
 
         ManagedPtr(unsigned int id, const std::vector<Target*>* storage)
         : __id(id), __storage(storage) {
         }
 
         Target&
         operator*() const {
             assert(isValid() && "Invalid Ptr");
             return *__storage->at(__id);
         }
 
         void operator=(const ManagedPtr<Target>& other) {
             __id = other.__id;
             __storage = other.__storage;
         }
 
         bool
         operator==(const ManagedPtr<Target>& other) {
             return isValid() && (__id == other.__id);
         }
 
         Target*
         operator->() const noexcept {
             assert(isValid() && "Invalid Ptr");
             return __storage->at(__id);
         }
 
         inline bool isValid() const {
             return (__storage) && (0 <= __id) && (__id < __storage->size());
         }
 
         inline operator bool() const {
             return isValid();
         }
 
         ManagedPtr<Target>& operator++() {
             ++__id;
             return *this;
         }
 
         inline unsigned int id() const {
             return __id;
         }
 
     private:
         unsigned int __id = 0;
         const std::vector<Target*> * __storage = 0;
     };
 
     typedef ManagedPtr<Function> ManagedFnPtr;
     typedef ManagedPtr<CodeScope> ManagedScpPtr;
     typedef ManagedPtr<MetaRuleAbstract> ManagedRulePtr;
     const ManagedScpPtr NO_SCOPE = ManagedScpPtr(UINT_MAX, 0);
 
     //To update ExpressionHints in case of any changes 
     struct Expression {
         friend class CodeScope;
         friend class ClaspLayer;
         friend class CFAPass;
         friend class ExpressionHints;
 
         Expression(const Operator &oprt, std::initializer_list<Expression> params);
         Expression(const Atom<Identifier_t>& ident);
         Expression(const Atom<Number_t>& number);
         Expression(const Atom<String_t>& a);
         
         Expression();
 
         void setOp(Operator oprt);
         void addArg(Expression&& arg);
         void addBindings(std::initializer_list<Atom<Identifier_t>> params);
         void bindType(TypeAnnotation t);
 
         template<class InputIt>
         void addBindings(InputIt paramsBegin, InputIt paramsEnd);
         void addTags(const std::list<Expression> tags) const;
         void addBlock(ManagedScpPtr scope);
 
         const std::vector<Expression>& getOperands() const;
         double getValueDouble() const;
         void setValueDouble(double value);
         const std::string& getValueString() const;
         void setValue(const Atom<Identifier_t>&& v);
         bool isValid() const;
         bool isDefined() const;
         
 
         bool operator==(const Expression& other) const;
 
         enum {
             INVALID, COMPOUND, IDENT, NUMBER, STRING, VARIANT, BINDING
         } __state = INVALID;
         
         Operator op;
         unsigned int id;
         std::vector<std::string> bindings;
         std::map<std::string, size_t> __indexBindings;
         std::vector<Expression> operands;
         TypeAnnotation type;
 
         mutable std::map<std::string, Expression> tags;
         std::list<CodeScope*> blocks;
 
     private:
         std::string __valueS;
         double __valueD;
         
         static unsigned int nextVacantId;
     };
     
     bool operator< (const Expression&, const Expression&);
 
     template<class InputIt>
     void Expression::addBindings(InputIt paramsBegin, InputIt paramsEnd) {
         size_t index = bindings.size();
 
         std::transform(paramsBegin, paramsEnd, std::inserter(bindings, bindings.end()),
                 [&index, this] (const Atom<Identifier_t> atom) {
                     std::string key = atom.get();
                     this->__indexBindings[key] = index++;
                     return key;
                 });
     }
 
     typedef std::list<Expression> ExpressionList;
 
     enum class TagModifier {
         NONE, ASSERT, REQUIRE
     };
 
     enum class DomainAnnotation {
         FUNCTION, VARIABLE
     };
 
     class RuleArguments : public std::vector<std::pair<std::string, DomainAnnotation>>
     {
         public:
         void add(const Atom<Identifier_t>& name, DomainAnnotation typ);
     };
 
     class RuleGuards : public std::vector<Expression> {
     public:
         void add(Expression&& e);
     };
 
 
     class ClaspLayer;
     class LLVMLayer;
 
     class MetaRuleAbstract {
     public:
         MetaRuleAbstract(RuleArguments&& args, RuleGuards&& guards);
         virtual ~MetaRuleAbstract();
         virtual void compile(ClaspLayer& layer) = 0;
     protected:
         RuleArguments __args;
         RuleGuards __guards;
     };
 
     class RuleWarning : public MetaRuleAbstract {
         friend class ClaspLayer;
     public:
         RuleWarning(RuleArguments&& args, RuleGuards&& guards, Expression&& condition, Atom<String_t>&& message);
         virtual void compile(ClaspLayer& layer);
         ~RuleWarning();
 
     private:
         std::string __message;
         Expression __condition;
     };
 
     typedef unsigned int VNameId;
     
     typedef int VariableVersion;
     const VariableVersion VERSION_NONE = -2;
     const VariableVersion VERSION_INIT = 0;
     
     template<>
     struct AttachmentsDict<VariableVersion>
     {
         typedef VariableVersion Data;
         static const unsigned int key = 6;
     };
     
     struct ScopedSymbol{
         VNameId id;
         VariableVersion version;
         
         static const ScopedSymbol RetSymbol;
     };
     
     struct Symbol {
         ScopedSymbol identifier;
         CodeScope * scope;
     };
     
     template<>
     struct AttachmentsDict<Symbol>
     {
         typedef Symbol Data;
         static const unsigned int key = 7;
     };
     
 } 
 namespace std
 {
     template<>
     struct hash<xreate::ScopedSymbol>{
         std::size_t operator()(xreate::ScopedSymbol const& s) const;
     };
 
     template<>
     struct equal_to<xreate::ScopedSymbol>{
       bool operator()(const xreate::ScopedSymbol& __x, const xreate::ScopedSymbol& __y) const;
     };
 }
 
 namespace xreate {
 
     
     typedef std::pair<Expression, TagModifier> Tag;
 
     bool operator<(const ScopedSymbol& s1, const ScopedSymbol& s2);
     bool operator==(const ScopedSymbol& s1, const ScopedSymbol& s2);
     bool operator<(const Symbol& s1, const Symbol& s2);
     bool operator==(const Symbol& s1, const Symbol& s2);
 
 class CodeScope {
     friend class Function;
     friend class PassManager;
 
 public:
     CodeScope(CodeScope* parent = 0);
     void setBody(const Expression& body);
     Expression& getBody();
     void addDeclaration(Expression&& var, Expression&& body);
     void addBinding(Expression&& var, Expression&& argument);
     static const Expression& getDeclaration(const Symbol& symbol);
     const Expression& getDeclaration(const ScopedSymbol& symbol);
 
     ~CodeScope();
 
     std::vector<std::string> __bindings;
     std::map<std::string, VNameId> __identifiers;
     CodeScope* __parent;
 
     //TODO move __definitions to SymbolsAttachments data
     //NOTE: definition of return type has zero(0) variable index
     std::unordered_map<ScopedSymbol, Expression> __declarations;
     std::vector<Expression> tags;
     std::vector<Expression> contextRules;
 private:
     VNameId __vCounter = 1;
     ScopedSymbol registerIdentifier(const Expression& identifier);
 
 public:
     bool recognizeIdentifier(const Expression& identifier) const;
     ScopedSymbol getSymbol(const std::string& alias);
 };
 
 class Function {
     friend class Expression;
     friend class CodeScope;
     friend class AST;
 
 public:
     Function(const Atom<Identifier_t>& name);
 
     void addBinding(Atom <Identifier_t>&& name, Expression&& argument);
     void addTag(Expression&& tag, const TagModifier mod);
 
     const std::string& getName() const;
     const std::map<std::string, Expression>& getTags() const;
     CodeScope* getEntryScope() const;
     CodeScope* __entry;
     std::string __name;
     bool isPrefunction = false; //SECTIONTAG adhoc Function::isPrefunction flag
 
     Expression guardContext;
 private:
 
     std::map<std::string, Expression> __tags;
 };
 
 
 class ExternData;
 
 struct ExternEntry {
     std::string package;
     std::vector<std::string> headers;
 };
 
 typedef Expanded<TypeAnnotation> ExpandedType;
 
 enum ASTInterface {
     CFA, DFA, Extern, Adhoc
 };
 
 struct FunctionSpecialization {
     std::string guard;
     size_t id;
 };
 
 struct FunctionSpecializationQuery {
     std::unordered_set<std::string> context;
 };
 
 template<>
 struct AttachmentsId<Expression>{
     static unsigned int getId(const Expression& expression){
         return expression.id;
     }
 };
 
 template<>
 struct AttachmentsId<Symbol>{
     static unsigned int getId(const Symbol& s){
         return s.scope->__declarations.at(s.identifier).id;
     }
 };
 
 template<>
 struct AttachmentsId<ManagedFnPtr>{
     static unsigned int getId(const ManagedFnPtr& f){
         const Symbol symbolFunction{ScopedSymbol::RetSymbol, f->getEntryScope()};
         
         return AttachmentsId<Symbol>::getId(symbolFunction);
     }
 };
 
 class AST {
 public:
     AST();
 
     //TASK extern and DFA interfaces move into addInterfaceData
     /**
      *  DFA Interface
      */
     void addDFAData(Expression&& data);
 
     /**
      * Extern Interface
      */
     void addExternData(ExternData&& data);
 
     void addInterfaceData(const ASTInterface& interface, Expression&& data);
     void add(Function* f);
 
     void add(MetaRuleAbstract* r);
     ManagedScpPtr add(CodeScope* scope);
 
     std::string getModuleName();
     ManagedPtr<Function> findFunction(const std::string& name);
 
     typedef std::multimap<std::string, unsigned int> FUNCTIONS_REGISTRY;
     std::list<ManagedFnPtr> getAllFunctions() const;
     std::list<ManagedFnPtr> getFunctionVariants(const std::string& name) const;
 
 
     template<class Target>
     ManagedPtr<Target> begin();
 
     std::vector<ExternEntry> __externdata;
     std::list<Expression> __dfadata; //TODO move to more appropriate place
     std::list<std::string> __rawImports; //TODO move to more appropriate place
     std::multimap<ASTInterface, Expression> __interfacesData; //TODO CFA data here.
 
 private:
     std::vector<MetaRuleAbstract*> __rules;
     std::vector<Function*> __functions;
     std::vector<CodeScope*> __scopes;
 
     FUNCTIONS_REGISTRY __indexFunctions;
 
 
     // ***** TYPES SECTION *****
 public:
     std::map<std::string, TypeAnnotation> __indexTypeAliases;
     ExpandedType expandType(const TypeAnnotation &t) const;
     ExpandedType findType(const std::string& name);
     ExpandedType getType(const Expression& expression);
     void add(TypeAnnotation t, Atom<Identifier_t> alias);
 
     //TODO revisit enums/variants, move to codescope
     bool recognizeVariantIdentifier(Expression& identifier);
 
 
 private:
     std::map<std::string, std::pair<TypeAnnotation, int>> __dictVariants;
     ExpandedType expandType(const TypeAnnotation &t, std::map<std::string, TypeAnnotation> scope,
             const std::vector<TypeAnnotation> &args = std::vector<TypeAnnotation>()) const;
 
     // ***** SYMBOL RECOGNITION *****
 public:
     std::set<std::pair<CodeScope*, Expression>> binUnrecognizedIdentifiers;
 
 public:
     void postponeIdentifier(CodeScope* scope, const Expression& id);
     void recognizePostponedIdentifiers();
 };
 
 template<>
 ManagedPtr<Function>
 AST::begin<Function>();
 
 template<>
 ManagedPtr<CodeScope>
 AST::begin<CodeScope>();
 
 template<>
 ManagedPtr<MetaRuleAbstract>
 AST::begin<MetaRuleAbstract>();
 
 }
 #endif // AST_H
diff --git a/cpp/src/llvmlayer.cpp b/cpp/src/llvmlayer.cpp
index 2d9cce1..e031be7 100644
--- a/cpp/src/llvmlayer.cpp
+++ b/cpp/src/llvmlayer.cpp
@@ -1,258 +1,257 @@
 #include "ast.h"
 #include "llvmlayer.h"
 #include "ExternLayer.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/MCJIT.h"
 #include "llvm/Support/TargetSelect.h"
 #include <iostream>
 #include <cmath>
 
 using namespace llvm;
 using namespace xreate;
 using namespace std;
 
 LLVMLayer::LLVMLayer(AST* root)
     : ast(root), builder(getGlobalContext()) {
     module = new llvm::Module(root->getModuleName(), llvm::getGlobalContext());
     layerExtern = new ExternLayer(this);
     layerExtern->init(root);
 }
 
 void*
 LLVMLayer::getFunctionPointer(llvm::Function* function){
 	uint64_t entryAddr = jit->getFunctionAddress(function->getName().str());
 	return (void*) entryAddr;
 }
 
 void
 LLVMLayer::initJit(){
 	std::string ErrStr;
 	LLVMInitializeNativeTarget();
 	llvm::InitializeNativeTargetAsmPrinter();
 
 	llvm::EngineBuilder builder((std::unique_ptr<llvm::Module>(module)));
 	jit = builder
 		.setEngineKind(llvm::EngineKind::JIT)
 		.setErrorStr(&ErrStr)
 		.setVerifyModules(true)
 		.create();
 }
 
 void
 LLVMLayer::print(){
     llvm::PassManager<llvm::Module> PM;
     PM.addPass(llvm::PrintModulePass(llvm::outs(), "banner"));
     PM.run(*module);
 }
 
 llvm::BasicBlock*
 LLVMLayer::initExceptionBlock(llvm::BasicBlock* blockException){
 	initExceptionsSupport();
 
 	PointerType* tyInt8P = PointerType::getInt8PtrTy(llvm::getGlobalContext());
     Value* nullInt8P = llvm::ConstantPointerNull::get(tyInt8P);
 
 
 	builder.SetInsertPoint(blockException);
 	llvm::Function* fAllocate = module->getFunction("__cxa_allocate_exception");
 	llvm::Function* fThrow = module->getFunction("__cxa_throw");
 
 	auto exception = builder.CreateCall(fAllocate, ConstantInt::get(IntegerType::getInt64Ty(getGlobalContext()), 4));
 	vector<Value*> throwParams{exception, nullInt8P, nullInt8P};
 	builder.CreateCall(fThrow, ArrayRef<Value*>(throwParams));
 	builder.CreateUnreachable();
 
 	return blockException;
 }
 
 void
 LLVMLayer::moveToGarbage(void *o)
 {
     __garbage.push_back(o);
 }
 
 llvm::Type*
 LLVMLayer::
 toLLVMType(const ExpandedType& ty) const {
 	std::map<int, llvm::StructType*> empty;
 	return toLLVMType(ty, empty);
 }
 
 llvm::Type*
 LLVMLayer::
 toLLVMType(const ExpandedType& ty, std::map<int, llvm::StructType*>& conjuctions) const
 {
     TypeAnnotation t = ty;
     switch (t.__operator)
     {
         case TypeOperator::ARRAY:
         {
             assert(t.__operands.size()==1);
 
             TypeAnnotation elTy = t.__operands.at(0);
             return llvm::ArrayType::get(toLLVMType(ExpandedType(move(elTy)), conjuctions), t.__size);
         }
 
         case TypeOperator::STRUCT:
-        case TypeOperator::TUPLE:
         {
             assert(t.__operands.size());
 
             std::vector<llvm::Type*> pack_;
             pack_.reserve(t.__operands.size());
 
             std::transform(t.__operands.begin(), t.__operands.end(), std::inserter(pack_, pack_.end()),
 			   [this, &conjuctions](const TypeAnnotation& t){
 				   return toLLVMType(ExpandedType(TypeAnnotation(t)), conjuctions);
 			   });
 
             llvm::ArrayRef<llvm::Type*> pack(pack_);
 
             			//process recursive types:
             if (conjuctions.count(t.conjuctionId)) {
             	auto result = conjuctions[t.conjuctionId];
             	result->setBody(pack, false);
 
             	return result;
             }
 
             return llvm::StructType::get(llvm::getGlobalContext(), pack, false);
         };
 
         case TypeOperator::LINK: {
         	llvm::StructType* conjuction = llvm::StructType::create(llvm::getGlobalContext());
         	int id = t.conjuctionId;
 
         	conjuctions.emplace(id, conjuction);
         	return conjuction;
         };
 
         case TypeOperator::CALL:
         {
             assert(false);
         };
 
         case TypeOperator::CUSTOM:
         {
             //Look in extern types
 
             clang::QualType qt = layerExtern->lookupType(t.__valueCustom);
             return layerExtern->toLLVMType(qt);
         };
 
         case TypeOperator::VARIANT: {
         	int size = t.fields.size();
         	assert(size);
 
         	int bitcount = ceil(log2(size));
         	return llvm::Type::getIntNTy(llvm::getGlobalContext(), bitcount);
         }
 
         case TypeOperator::NONE: {
             switch (t.__value) {
                 case TypePrimitive::I32:
                 case TypePrimitive::Int:
                 case TypePrimitive::Num:
                     return llvm::Type::getInt32Ty(llvm::getGlobalContext());
 
                 case TypePrimitive::Bool:
                     return llvm::Type::getInt1Ty(llvm::getGlobalContext());
 
                 case TypePrimitive::I8:
                     return llvm::Type::getInt8Ty(llvm::getGlobalContext());
 
                 case TypePrimitive::I64:
                     return llvm::Type::getInt64Ty(llvm::getGlobalContext());
 
                 case TypePrimitive::Float:
                     return llvm::Type::getDoubleTy(llvm::getGlobalContext());
 
                 case TypePrimitive::String:
                     return llvm::Type::getInt8PtrTy(llvm::getGlobalContext());
 
                 default:
                     assert(false);
             }
         }
 
         default:
             assert(false);
     }
 
     assert(false);
     return  nullptr;
 }
 
 void
 LLVMLayer::initExceptionsSupport(){
 	Type* typInt8Ptr = PointerType::get(IntegerType::get(module->getContext(), 8), 0);
 
 	if (!module->getFunction("__cxa_throw")) {
 		std::vector<Type*>	fThrowSignature{typInt8Ptr, typInt8Ptr, typInt8Ptr};
 
 		 FunctionType* tyFThrow = FunctionType::get(
 		  /*Result=*/Type::getVoidTy(module->getContext()),
 		  /*Params=*/fThrowSignature,
 		  /*isVarArg=*/false);
 
 		llvm::Function::Create(
 	 /*Type=*/tyFThrow,
 	 /*Linkage=*/GlobalValue::ExternalLinkage,
 	 /*Name=*/"__cxa_throw", module); // (external, no body)
 	}
 
 	if (!module->getFunction("__cxa_allocate_exception")) {
 		 std::vector<Type*>fAllocateSignature{IntegerType::get(module->getContext(), 64)};
 
 		 FunctionType* tyFAllocate = FunctionType::get(
 		  /*Result=*/typInt8Ptr,
 		  /*Params=*/fAllocateSignature,
 		  /*isVarArg=*/false);
 
 		llvm::Function::Create(
 	 /*Type=*/tyFAllocate,
 	 /*Linkage=*/GlobalValue::ExternalLinkage,
 	 /*Name=*/"__cxa_allocate_exception", module); // (external, no body)
 	}
 }
 
 bool TypeUtils::isStruct(const ExpandedType& ty){
     const TypeAnnotation& t = ty.get();
 
     if (t.__operator==TypeOperator::STRUCT) {
         return true;
     }
 
     if (t.__operator != TypeOperator::CUSTOM) {
         return false;
     }
 
     clang::QualType tqual = llvm->layerExtern->lookupType(t.__valueCustom);
     const clang::Type * raw = tqual.getTypePtr();
 
         // TODO skip ALL the pointers until non-pointer type found
     if (raw->isStructureType()) return true;
     if (!raw->isAnyPointerType()) return false;
 
     clang::QualType pointee = raw->getPointeeType();
     return pointee->isStructureType();
 }
 
 
 bool TypeUtils::isPointer(const ExpandedType &ty) {
     if (ty.get().__operator != TypeOperator::CUSTOM) return false;
 
     clang::QualType qt = llvm->layerExtern->lookupType(ty.get().__valueCustom);
     return llvm->layerExtern->isPointer(qt);
 }
 
 
 std::vector<std::string>
 TypeUtils::getStructFields(const ExpandedType &t) {
     return (t.get().__operator == TypeOperator::STRUCT)
            ? t.get().fields
             : llvm->layerExtern->getStructFields(
                     llvm->layerExtern->lookupType(t.get().__valueCustom));
 }
 
 
diff --git a/cpp/src/pass/compilepass.cpp b/cpp/src/pass/compilepass.cpp
index 0859093..6e3aca0 100644
--- a/cpp/src/pass/compilepass.cpp
+++ b/cpp/src/pass/compilepass.cpp
@@ -1,807 +1,798 @@
 #include "compilepass.h"
 #include "clasplayer.h"
 #include <ast.h>
 #include "llvmlayer.h"
 
 #include "query/containers.h"
 #include "query/context.h"
 #include "compilation/containers.h"
 #include "compilation/latecontextcompiler2.h"
 #include "ExternLayer.h"
 #include "pass/adhocpass.h"
 #include "compilation/targetinterpretation.h"
 #include "pass/versionspass.h"
 #include "compilation/scopedecorators.h"
 #include "compilation/operators.h"
+#include "analysis/typeinference.h"
 
 #include <boost/optional.hpp>
 #include <memory>
 #include <iostream>
 
 using namespace std;
 using namespace xreate;
 using namespace xreate::compilation;
 using namespace llvm;
 
 //TODO use Scope<TargetLlvm>
 
 //SECTIONTAG types/convert implementation
 //TODO type conversion:
 //a)    automatically expand types int -> bigger int; int -> floating
 //b)    detect exact type of `num` based on max used numeral / function type
 //c)    warning if need to truncate (allow/dissalow based on annotations)
 
 namespace xreate {
 
-llvm::Value*
-doAutomaticTypeConversion(llvm::Value* source, llvm::Type* tyTarget, llvm::IRBuilder<>& builder){
-    if (tyTarget->isIntegerTy() && source->getType()->isIntegerTy())
-    {
-            llvm::IntegerType* tyTargetInt = llvm::dyn_cast<IntegerType>(tyTarget);
-            llvm::IntegerType* tySourceInt = llvm::dyn_cast<IntegerType>(source->getType());
-
-            if (tyTargetInt->getBitWidth() < tySourceInt->getBitWidth()){
-                    return builder.CreateCast(llvm::Instruction::Trunc, source, tyTarget);
-            }
-
-            if (tyTargetInt->getBitWidth() > tySourceInt->getBitWidth()){
-                    return builder.CreateCast(llvm::Instruction::SExt, source, tyTarget);
-            }
-    }
-
-    if (source->getType()->isIntegerTy() && tyTarget->isFloatingPointTy()){
-        return builder.CreateCast(llvm::Instruction::SIToFP, source, tyTarget);
-    }
-
-    return source;
-}
-
-
 std::string
 BasicFunctionDecorator::prepareName(){
     AST* ast = FunctionUnit::pass->man->root;
 
     string name = ast->getFunctionVariants(FunctionUnit::function->__name).size() > 1?
         FunctionUnit::function->__name  + std::to_string(FunctionUnit::function.id()) :
         FunctionUnit::function->__name;
 
     return name;
 }
 
 std::vector<llvm::Type*>
 BasicFunctionDecorator::prepareArguments(){
     LLVMLayer* llvm = FunctionUnit::pass->man->llvm;
     AST* ast = FunctionUnit::pass->man->root;
     CodeScope* entry = FunctionUnit::function->__entry;
     std::vector<llvm::Type*> signature;
 
     std::transform(entry->__bindings.begin(), entry->__bindings.end(), std::inserter(signature, signature.end()),
             [llvm, ast, entry](const std::string &arg)->llvm::Type* {
                 assert(entry->__identifiers.count(arg));
 
                 ScopedSymbol argid{entry->__identifiers.at(arg), VERSION_NONE};
                 return llvm->toLLVMType(ast->expandType(entry->__declarations.at(argid).type));
     });
 
     return signature;
 }
 
 llvm::Type*
 BasicFunctionDecorator::prepareResult(){
     LLVMLayer* llvm = FunctionUnit::pass->man->llvm;
     AST* ast = FunctionUnit::pass->man->root;
     CodeScope* entry = FunctionUnit::function->__entry;
 
     return llvm->toLLVMType(ast->expandType(entry->__declarations.at(ScopedSymbol::RetSymbol).type));
 }
 
 llvm::Function::arg_iterator
 BasicFunctionDecorator::prepareBindings(){
     CodeScope* entry = FunctionUnit::function->__entry;
     AbstractCodeScopeUnit* entryCompilation = FunctionUnit::getScopeUnit(entry);
     llvm::Function::arg_iterator fargsI = FunctionUnit::raw->arg_begin();
 
     for (std::string &arg : entry->__bindings) {
         ScopedSymbol argid{entry->__identifiers[arg], VERSION_NONE};
 
         entryCompilation->bindArg(&*fargsI, argid);
         fargsI->setName(arg);
         ++fargsI;
     }
 
     return fargsI;
 }
 
 //SECTIONTAG late-context FunctionDecorator
 template<class Parent>
 class LateContextFunctionDecorator: public Parent{
 public:
     LateContextFunctionDecorator(ManagedFnPtr f, CompilePass* p)
         : Parent(f, p), contextCompiler(this, p)
     {}
 
 protected:
     std::vector<llvm::Type*>  prepareArguments(){
         std::vector<llvm::Type*>&& arguments = Parent::prepareArguments();
 
         size_t sizeLateContextDemand = contextCompiler.getFunctionDemandSize();
         if (sizeLateContextDemand) {
             llvm::Type* ty32 = llvm::Type::getInt32Ty(llvm::getGlobalContext());
             llvm::Type* tyDemand = llvm::ArrayType::get(ty32, sizeLateContextDemand);
 
             arguments.push_back(tyDemand);
         }
 
         return arguments;
     }
 
     llvm::Function::arg_iterator prepareBindings(){
         llvm::Function::arg_iterator fargsI = Parent::prepareBindings();
 
         size_t sizeLateContextDemand = contextCompiler.getFunctionDemandSize();
         if (sizeLateContextDemand){
             fargsI->setName("latecontext");
             contextCompiler.rawContextArgument = &*fargsI;
             ++fargsI;
         }
 
         return fargsI;
     }
 
 public:
     LateContextCompiler2 contextCompiler;
 
 };
 
 //SECTIONTAG adhoc FunctionDecorator
 template<class Parent>
 class AdhocFunctionDecorator: public Parent{
 public:
     AdhocFunctionDecorator(ManagedFnPtr f, CompilePass* p)
         : Parent(f, p)    {}
 
 protected:
     llvm::Type* prepareResult(){
         PassManager* man = Parent::pass->man;
         CodeScope* entry = Parent::function->__entry;
         LLVMLayer* llvm = Parent::pass->man->llvm;
         AST* ast = Parent::pass->man->root;
         AdhocPass* adhocpass = reinterpret_cast<AdhocPass*>(man->getPassById(PassId::AdhocPass));
 
         if (! Parent::function->isPrefunction){
             return Parent::prepareResult();
         }
 
         adhocImplementation = adhocpass->findAssotiatedScheme(entry);
         return llvm->toLLVMType(ast->expandType(adhocImplementation->getResultType()));
     }
 
 public:
     AdhocScheme* adhocImplementation=nullptr;
 
 };
 
 //DEBT compiler rigidly depends on exact definition of DefaultFunctionUnit
 typedef LateContextFunctionDecorator<
         AdhocFunctionDecorator<
         BasicFunctionDecorator>> DefaultFunctionUnit;
 
 
 AbstractCodeScopeUnit::AbstractCodeScopeUnit(CodeScope* codeScope, FunctionUnit* f, CompilePass* compilePass)
     : pass(compilePass), function(f), scope(codeScope)
 {}
 
 
 llvm::Value*
 CallStatementRaw::operator() (std::vector<llvm::Value *>&& args, const std::string& hintDecl) {
     llvm::Function* calleeInfo = dyn_cast<llvm::Function>(__callee);
 
     if (calleeInfo){
         auto argsFormal = calleeInfo->args();
 
         int pos=0;
         //SECTIONTAG types/convert function ret value
         for (auto argFormal = argsFormal.begin(); argFormal!=argsFormal.end(); ++argFormal, ++pos){
-            args[pos] = doAutomaticTypeConversion(args[pos], argFormal->getType(), llvm->builder);
+            args[pos] = analysis::typeinference::doAutomaticTypeConversion(args[pos], argFormal->getType(), llvm->builder);
         }
     }
 
     return llvm->builder.CreateCall(__calleeTy, __callee, args, hintDecl);
 }
 
 //DESABLEDFEATURE implement inlining
 class CallStatementInline: public CallStatement{
 public:
 	CallStatementInline(FunctionUnit* caller, FunctionUnit* callee, LLVMLayer* l)
 		: __caller(caller), __callee(callee), llvm(l) {}
 
 	llvm::Value* operator() (std::vector<llvm::Value *>&& args, const std::string& hintDecl) {
 		//TOTEST inlining
 //            CodeScopeUnit* entryCompilation = outer->getScopeUnit(function->__entry);
 //            for(int i=0, size = args.size(); i<size; ++i) {
 //                entryCompilation->bindArg(args.at(i), string(entryCompilation->scope->__bindings.at(i)));
 //            }
 //
 //
 //            return entryCompilation->compile();
 
             return nullptr;
 	}
 
 private:
 	FunctionUnit* __caller;
 	FunctionUnit* __callee;
         LLVMLayer* llvm;
 
         bool isInline(){
             // Symbol ret = Symbol{0, function->__entry};
             // bool flagOnTheFly = SymbolAttachments::get<IsImplementationOnTheFly>(ret, false);
             //TODO consider inlining
             return false;
         }
 };
 
 }
 
 BasicCodeScopeUnit::BasicCodeScopeUnit(CodeScope* codeScope, FunctionUnit* f, CompilePass* compilePass)
     : AbstractCodeScopeUnit(codeScope, f, compilePass)
 {}
 
 llvm::Value*
 BasicCodeScopeUnit::processSymbol(const Symbol& s, std::string hintRetVar){
     Expression declaration = CodeScope::getDeclaration(s);
     CodeScope* scope = s.scope;
     AbstractCodeScopeUnit* self = AbstractCodeScopeUnit::function->getScopeUnit(scope);
 
     return self->process(declaration, hintRetVar);
 }
 
 
 //SECTIONTAG late-context find callee function
 //TOTEST static late context decisions
 //TOTEST dynamic late context decisions
 CallStatement*
 BasicCodeScopeUnit::findFunction(const std::string& calleeName){
     LLVMLayer* llvm = pass->man->llvm;
     ClaspLayer* clasp = pass->man->clasp;
     DefaultFunctionUnit* function = dynamic_cast<DefaultFunctionUnit*>(this->function);
     ContextQuery* queryContext = pass->queryContext;
 
     const std::list<ManagedFnPtr>& specializations = pass->man->root->getFunctionVariants(calleeName);
 
     //if no specializations registered - check external function
     if (specializations.size()==0){
         llvm::Function* external = llvm->layerExtern->lookupFunction(calleeName);
 
         llvm::outs() << "Debug/External function: " << calleeName;
         external->getType()->print(llvm::outs(), true);
         llvm::outs() << "\n";
 
         return new CallStatementRaw(external, llvm);
     }
 
     //no decisions required
     if (specializations.size()==1){
         if (!specializations.front()->guardContext.isValid()) {
             return new CallStatementRaw( pass->getFunctionUnit(specializations.front())->compile(), llvm);
         }
     }
 
     //TODO move dictSpecialization over to a separate function in order to perform cache, etc.
     //prepare specializations dictionary
     std::map<Expression, ManagedFnPtr> dictSpecializations;
 
     boost::optional<ManagedFnPtr> variantDefault;
     boost::optional<ManagedFnPtr> variant;
 
     for(const ManagedFnPtr& f: specializations){
         const Expression& guard = f->guardContext;
 
         //default case:
         if (!guard.isValid()){
                 variantDefault = f;
                 continue;
         }
 
         assert(dictSpecializations.emplace(guard, f).second && "Found several identical specializations");
     }
 
     //check static context
     ScopePacked scopeCaller = clasp->pack(this->scope);
     const string atomSpecialization = "specialization";
     const Expression topicSpecialization(Operator::CALL, {(Atom<Identifier_t>(string(atomSpecialization))), (Atom<Identifier_t>(string(calleeName))), (Atom<Number_t>(scopeCaller))});
 
     const Decisions& decisions = queryContext->getFinalDecisions(scopeCaller);
     if (decisions.count(topicSpecialization)){
         variant =  dictSpecializations.at(decisions.at(topicSpecialization));
     }
 
     //TODO check only demand for this particular topic.
     size_t sizeDemand = function->contextCompiler.getFunctionDemandSize();
 
     //decision made if static context found or no late context exists(and there is default variant)
     bool flagHasStaticDecision =  variant || (variantDefault && !sizeDemand);
 
     //if no late context exists
     if (flagHasStaticDecision) {
         FunctionUnit* calleeUnit = pass->getFunctionUnit(variant? *variant: *variantDefault);
 
             //inlining possible based on static decision only
 //        if (calleeUnit->isInline()) {
 //            return new CallStatementInline(function, calleeUnit);
 //        }
 
         return new CallStatementRaw(calleeUnit->compile(), llvm);
     }
 
     //require default variant if no static decision made
     assert(variantDefault);
 
     llvm::Function* functionVariantDefault = this->pass->getFunctionUnit(*variantDefault)->compile();
     llvm::Value* resultFn = function->contextCompiler.findFunction(calleeName, functionVariantDefault, scopeCaller);
     llvm::PointerType *resultPTy = cast<llvm::PointerType>(resultFn->getType());
     llvm::FunctionType *resultFTy = cast<llvm::FunctionType>(resultPTy->getElementType());
     return new CallStatementRaw(resultFn, resultFTy, llvm);
 }
 
 
 
 //DISABLEDFEATURE transformations
 //    if (pass->transformations->isAcceptable(expr)){
 //        return pass->transformations->transform(expr, result, ctx);
 //    }
 
 llvm::Value*
 BasicCodeScopeUnit::process(const Expression& expr, const std::string& hintVarDecl){
 #define DEFAULT(x) (hintVarDecl.empty()? x: hintVarDecl)
     llvm::Value *left; llvm::Value *right;
     LLVMLayer& l = *pass->man->llvm;
     xreate::compilation::Advanced instructions = xreate::compilation::Advanced({this, function, pass});
 
     switch (expr.op) {
         case Operator::SUB: case Operator::MUL:
         case Operator::DIV: case Operator::EQU: case Operator::LSS:
         case Operator::GTR: case Operator::NE:  case Operator::LSE:
         case Operator::GTE:
 
             assert(expr.__state == Expression::COMPOUND);
             assert(expr.operands.size() == 2);
 
             left = process(expr.operands[0]);
             right = process(expr.operands[1]);
 
             //SECTIONTAG types/convert binary operation
-           	right =	doAutomaticTypeConversion(right, left->getType(), l.builder);
+           	right =	analysis::typeinference::doAutomaticTypeConversion(right, left->getType(), l.builder);
             break;
 
         default:;
     }
 
     switch (expr.op) {
         case Operator::ADD:{
             left = process(expr.operands[0]);
             Context context{this, function, pass};
 
             llvm::Value* resultSU = StructUpdate::add(expr.operands[0], left, expr.operands[1], context, DEFAULT("tmp_add"));
             if (resultSU) return resultSU;
 
             right = process(expr.operands[1]);
 
             llvm::Value* resultAddPA = PointerArithmetic::add(left, right, context,DEFAULT("tmp_add"));
             if (resultAddPA) {return resultAddPA;}
 
             return l.builder.CreateAdd(left, right, DEFAULT("tmp_add"));
             break;
         }
 
         case Operator::SUB:
             return l.builder.CreateSub(left, right, DEFAULT("tmp_sub"));
             break;
 
         case Operator::MUL:
             return l.builder.CreateMul(left, right, DEFAULT("tmp_mul"));
             break;
 
         case Operator::DIV:
             return l.builder.CreateSDiv(left, right, DEFAULT("tmp_div"));
             break;
 
         case Operator::EQU:
             if (left->getType()->isIntegerTy()) return l.builder.CreateICmpEQ(left, right, DEFAULT("tmp_equ"));
             if (left->getType()->isFloatingPointTy()) return l.builder.CreateFCmpOEQ(left, right, DEFAULT("tmp_equ"));
             break;
 
         case Operator::NE:
             return l.builder.CreateICmpNE(left, right, DEFAULT("tmp_ne"));
             break;
 
         case Operator::LSS:
             return l.builder.CreateICmpSLT(left, right, DEFAULT("tmp_lss"));
             break;
 
         case Operator::LSE:
             return l.builder.CreateICmpSLE(left, right, DEFAULT("tmp_lse"));
             break;
 
         case Operator::GTR:
             return l.builder.CreateICmpSGT(left, right, DEFAULT("tmp_gtr"));
             break;
 
         case Operator::GTE:
             return l.builder.CreateICmpSGE(left, right, DEFAULT("tmp_gte"));
             break;
 
         case Operator::NEG:
             left = process(expr.operands[0]);
             return l.builder.CreateNeg(left, DEFAULT("tmp_neg"));
             break;
 
         case Operator::CALL: {
             assert(expr.__state == Expression::COMPOUND);
 
             std::string nameCallee = expr.getValueString();
             shared_ptr<CallStatement> callee(findFunction(nameCallee));
 
             //prepare arguments
             std::vector<llvm::Value *> args;
             args.reserve(expr.operands.size());
 
             std::transform(expr.operands.begin(), expr.operands.end(), std::inserter(args, args.end()),
 				[this](const Expression &operand) {
 					return process(operand);
 				}
             );
 
             ScopePacked outerScopeId = pass->man->clasp->pack(this->scope);
 
             //TASK a) refactor CALL/ADHOC/find function
             //SECTIONTAG late-context propagation arg
             size_t calleeDemandSize = pass->queryContext->getFunctionDemand(nameCallee).size();
             if (calleeDemandSize){
                 DefaultFunctionUnit* function = dynamic_cast<DefaultFunctionUnit*>(this->function);
             	llvm::Value* argLateContext = function->contextCompiler.compileContextArgument(nameCallee, outerScopeId);
             	args.push_back(argLateContext);
             }
 
             return (*callee)(move(args), DEFAULT("res_"+nameCallee));
         }
 
         case Operator::IF:
         {
         	return instructions.compileIf(expr, DEFAULT("tmp_if"));
         }
 
         case Operator::SWITCH:
         {
         	return instructions.compileSwitch(expr, DEFAULT("tmp_switch"));
         }
 
         case Operator::LOOP_CONTEXT:
         {
             assert(false);
             return nullptr;
             //return instructions.compileLoopContext(expr, DEFAULT("tmp_loop"));
         }
 
         case Operator::LOGIC_AND: {
         	assert(expr.operands.size() == 1);
         	return process (expr.operands[0]);
         }
 
         case Operator::LIST:
         {
            return instructions.compileListAsSolidArray(expr, DEFAULT("tmp_list"));
         };
 
         case Operator::LIST_RANGE:
         {
             assert(false); //no compilation phase for a range list
           //  return InstructionList(this).compileConstantArray(expr, l, hintRetVar);
         };
 
         case Operator::LIST_NAMED:
         {
             typedef Expanded<TypeAnnotation> ExpandedType;
 
             ExpandedType tyStructLiteral = l.ast->getType(expr);
 
             const std::vector<string> fieldsFormal = (tyStructLiteral.get().__operator == TypeOperator::CUSTOM)?
                 l.layerExtern->getStructFields(l.layerExtern->lookupType(tyStructLiteral.get().__valueCustom))
                 : tyStructLiteral.get().fields;
 
             std::map<std::string, size_t> indexFields;
             for(size_t i=0, size = fieldsFormal.size(); i<size; ++i){
                 indexFields.emplace(fieldsFormal[i], i);
             }
 
             llvm::StructType* tyLiteralRaw = llvm::cast<llvm::StructType>(l.toLLVMType(tyStructLiteral));
             llvm::Value* record = llvm::UndefValue::get(tyLiteralRaw);
 
             for (size_t i=0; i<expr.operands.size(); ++i){
                 const Expression& operand = expr.operands.at(i);
                 unsigned int fieldId = indexFields.at(expr.bindings.at(i));
 
                 llvm::Value* result = 0;
 
 //TODO Null ad hoc llvm implementation (related code: operators/StructUpdate/add)
 //                if (operand.isNone()){
 //                    llvm::Type* tyNullField = tyRecord->getElementType(fieldId);
 //                    result = llvm::UndefValue::get(tyNullField);
 //
 //                } else {
                     result = process(operand);
 //                }
 
                 assert (result);
                 record = l.builder.CreateInsertValue(record, result, llvm::ArrayRef<unsigned>({fieldId}));
             }
 
             return record;
         };
 
 
 
         case Operator::MAP:
         {
             assert(expr.blocks.size());
             return instructions.compileMapSolidOutput(expr, DEFAULT("map"));
         };
 
         case Operator::FOLD:
         {
             return instructions.compileFold(expr, DEFAULT("fold"));
         };
 
         case Operator::FOLD_INF:
         {
             return instructions.compileFoldInf(expr, DEFAULT("fold"));
         };
 
         case Operator::INDEX:
         {
                 //TODO allow multiindex
             assert(expr.operands.size()==2);
             assert(expr.operands[0].__state == Expression::IDENT);
 
             const std::string& hintIdent= expr.operands[0].getValueString();
             Symbol s = Attachments::get<Symbol>(expr.operands[0]);
             const ExpandedType& t2 = pass->man->root->getType(expr.operands[0]);
 
             llvm::Value* aggr  = processSymbol(s, hintIdent);
 
             switch (t2.get().__operator)
             {
                 case TypeOperator::STRUCT: case TypeOperator::CUSTOM:
                 {
+                    std::string idxField;
                     const Expression& idx = expr.operands.at(1);
-                    assert(idx.__state == Expression::STRING);
-                    std::string idxField = idx.getValueString();
+                    switch (idx.__state) {
+
+                            //named struct field
+                        case  Expression::STRING:
+                            idxField = idx.getValueString();
+                            break;
+
+                            //anonymous struct field
+                        case Expression::NUMBER:
+                            idxField = to_string((int)idx.getValueDouble());
+                            break;
+
+                        default:
+                            assert(false&& "Wrong index for a struct");
+                    }
 
                     return instructions.compileStructIndex(aggr, t2, idxField);
                 };
 
                 case TypeOperator::ARRAY: {
                     std::vector<llvm::Value*> indexes;
                     std::transform(++expr.operands.begin(), expr.operands.end(), std::inserter(indexes, indexes.end()),
                         [this] (const Expression& op){
                             return process(op);
                         }
                     );
 
                     return instructions.compileArrayIndex(aggr, indexes, DEFAULT(string("el_") + hintIdent));
                 };
 
                 default:
                     assert(false);
             }
         };
 
         	//SECTIONTAG adhoc actual compilation
                 //TODO a) make sure that it's correct: function->adhocImplementation built for Entry scope and used in another scope
         case Operator::ADHOC: {
             DefaultFunctionUnit* function = dynamic_cast<DefaultFunctionUnit*>(this->function);
             assert(function->adhocImplementation && "Adhoc implementation not found");
             const Expression& comm = AdhocExpression(expr).getCommand();
 
             CodeScope* scope = function->adhocImplementation->getCommandImplementation(comm);
             AbstractCodeScopeUnit* unitScope = function->getScopeUnit(scope);
 
             //SECTIONTAG types/convert ADHOC ret convertation
             llvm::Type* resultTy = l.toLLVMType( pass->man->root->expandType(function->adhocImplementation->getResultType()));
-            return doAutomaticTypeConversion(unitScope->compile(), resultTy, l.builder);
+            return analysis::typeinference::doAutomaticTypeConversion(unitScope->compile(), resultTy, l.builder);
         };
 
         case Operator::CALL_INTRINSIC:{
             const std::string op = expr.getValueString();
 
             if (op == "copy") {
                 llvm::Value* result = process(expr.getOperands().at(0));
 
                 auto decoratorVersions = Decorators<VersionsScopeDecoratorTag>::getInterface(this);
                 llvm::Value* storage = decoratorVersions->processIntrinsicInit(result->getType());
                 decoratorVersions->processIntrinsicCopy(result, storage);
 
                 return l.builder.CreateLoad(storage, hintVarDecl);
             }
 
             assert(false && "undefined intrinsic");
         }
 
         case Operator::NONE:
             assert(expr.__state != Expression::COMPOUND);
 
             switch (expr.__state) {
                 case Expression::IDENT: {
                     Symbol s = Attachments::get<Symbol>(expr);
                     return processSymbol(s, expr.getValueString());
                 }
 
                 case Expression::NUMBER: {
                     llvm::Type* typConst;
 
                     if (expr.type.isValid()){
                         typConst = l.toLLVMType(pass->man->root->getType(expr));
 
                     } else {
                         typConst = llvm::Type::getInt32Ty(llvm::getGlobalContext());
                     }
 
                     int literal = expr.getValueDouble();
                     return llvm::ConstantInt::get(typConst, literal);
                 }
 
                 case Expression::STRING: {
                     return instructions.compileConstantStringAsPChar(expr.getValueString(), DEFAULT("tmp_str"));
                 };
 
                 case Expression::VARIANT: {
                 	const ExpandedType& typVariant = pass->man->root->getType(expr);
                 	llvm::Type* typRaw = l.toLLVMType(typVariant);
                 	int value = expr.getValueDouble();
                     return llvm::ConstantInt::get(typRaw, value);
                 }
 
                 default: {
                     break;
                 }
             };
 
             break;
 
         default: break;
 
     }
 
     assert(false);
     return 0;
 }
 
 llvm::Value*
 BasicCodeScopeUnit::compile(const std::string& hintBlockDecl){
     if (!hintBlockDecl.empty()) {
         llvm::BasicBlock *block = llvm::BasicBlock::Create(llvm::getGlobalContext(), hintBlockDecl, function->raw);
         pass->man->llvm->builder.SetInsertPoint(block);
     }
 
     Symbol symbScope = Symbol{ScopedSymbol::RetSymbol, scope};
     return processSymbol(symbScope);
 }
 
 AbstractCodeScopeUnit::~AbstractCodeScopeUnit()
 {}
 
 FunctionUnit::~FunctionUnit()
 {}
 
 llvm::Function*
 FunctionUnit::compile(){
     if (raw != nullptr) return raw;
 
     LLVMLayer* llvm = pass->man->llvm;
     llvm::IRBuilder<>& builder = llvm->builder;
 
     string&& functionName = prepareName();
     std::vector<llvm::Type*>&& types = prepareArguments();
     llvm::Type* expectedResultType = prepareResult();
 
     llvm::FunctionType *ft = llvm::FunctionType::get(expectedResultType, types, false);
     raw = llvm::cast<llvm::Function>(llvm->module->getOrInsertFunction(functionName, ft));
     prepareBindings();
 
 
     const std::string&blockName =  "entry";
     llvm::BasicBlock* blockCurrent = builder.GetInsertBlock();
 
     llvm::Value* result =getScopeUnit(function->__entry)->compile(blockName);
     assert(result);
 
     //SECTIONTAG types/convert function ret value
-    builder.CreateRet(doAutomaticTypeConversion(result, expectedResultType, llvm->builder));
+    builder.CreateRet(analysis::typeinference::doAutomaticTypeConversion(result, expectedResultType, llvm->builder));
 
     if (blockCurrent){
     	builder.SetInsertPoint(blockCurrent);
     }
 
     llvm->moveToGarbage(ft);
     return raw;
 }
 
 AbstractCodeScopeUnit*
 FunctionUnit::getScopeUnit(CodeScope* scope){
     if (__scopes.count(scope)) {
         auto result = __scopes.at(scope).lock();
 
         if (result){
             return result.get();
         }
     }
 
     std::shared_ptr<AbstractCodeScopeUnit> unit(new DefaultScopeUnit(scope, this, pass));
 
     if (scope->__parent != nullptr){
         auto parentUnit = Decorators<CachedScopeDecoratorTag>::getInterface(getScopeUnit(scope->__parent));
         parentUnit->registerChildScope(unit);
 
     } else {
         __orphanedScopes.push_back(unit);
     }
 
     if (!__scopes.emplace(scope, unit).second){
         __scopes[scope] = unit;
     }
 
     return unit.get();
 }
 
 AbstractCodeScopeUnit*
 FunctionUnit::getScopeUnit(ManagedScpPtr scope){
     return getScopeUnit(&*scope);
 }
 
 AbstractCodeScopeUnit*
 FunctionUnit::getEntry(){
 	return getScopeUnit(function->getEntryScope());
 }
 
 
 
 FunctionUnit*
 CompilePass::getFunctionUnit(const ManagedFnPtr& function){
 	unsigned int id = function.id();
 
     if (!functions.count(id)){
     	FunctionUnit* unit = new DefaultFunctionUnit(function, this);
         functions.emplace(id, unit);
         return unit;
     }
 
     return functions.at(id);
 }
 
 void
 CompilePass::run(){
     managerTransformations = new TransformationsManager();
     targetInterpretation = new TargetInterpretation(this->man->root, this);
     queryContext = reinterpret_cast<ContextQuery*> (man->clasp->getQuery(QueryId::ContextQuery));
 
     //Find out main function;
     ClaspLayer::ModelFragment model = man->clasp->query(Config::get("function-entry"));
     assert(model && "Error: No entry function found");
     assert(model->first != model->second && "Error: Ambiguous entry function");
 
     string nameMain = std::get<0>(ClaspLayer::parse<std::string>(model->first->second));
     FunctionUnit* unitMain = getFunctionUnit(man->root->findFunction(nameMain));
     entry = unitMain->compile();
 }
 
 llvm::Function*
 CompilePass::getEntryFunction(){
 	assert(entry);
 	return entry;
 }
 
 void
 CompilePass::prepareQueries(ClaspLayer* clasp){
 	clasp->registerQuery(new containers::Query(), QueryId::ContainersQuery);
 	clasp->registerQuery(new ContextQuery(), QueryId::ContextQuery);
 }
diff --git a/cpp/tests/compilation.cpp b/cpp/tests/compilation.cpp
index 5188fe6..de1c7ff 100644
--- a/cpp/tests/compilation.cpp
+++ b/cpp/tests/compilation.cpp
@@ -1,60 +1,95 @@
 #include "passmanager.h"
 #include "gtest/gtest.h"
 using namespace xreate;
 //DEBT implement no pkgconfig ways to link libs
 
 //TOTEST FunctionUnit::compileInline
 TEST(Compilation, DISABLED_functionInline1){
 }
 
 TEST(Compilation, functionEntry1){
     std::unique_ptr<PassManager> program(PassManager::prepareForCode(
         "func1 = function(a:: int):: int {a+8} \
          func2 = function::int; entry {12 + func1(4)}      \
         "));
 
     void* entryPtr = program->run();
     int (*entry)() = (int (*)())(intptr_t)entryPtr;
 
     int answer = entry();
     ASSERT_EQ(24, answer);
 }
 
 TEST(Compilation, full_IFStatementWithVariantType){
     PassManager* man = PassManager::prepareForCode(
         "Color = type variant (RED, BLUE, GREEN).\n"
         "\n"
         "   main = function(x::int):: bool; entry {\n"
         "       color = if (x == 0 )::Color {RED} else {BLUE}.\n"
         "       if (color == BLUE)::bool {true} else {false}\n"
         "   }"
     );
 
     bool (*main)(int) = (bool (*)(int)) man->run();
     ASSERT_FALSE(main(0));
     ASSERT_TRUE(main(1));
 }
 
 TEST(Compilation, full_StructUpdate){
 PassManager* man = PassManager::prepareForCode(
     R"Code(
 
     Rec = type alias  {
         a :: int,
         b:: int
     }.
 
     test= function:: int; entry {
         a = {a = 18, b = 20}:: Rec.
 
         b = a + {a = 11}:: Rec.
         b["a"]
     }
     )Code");
 
     int (*main)() = (int (*)()) man->run();
     int result = main();
 
     ASSERT_EQ(11, result);
 }
 
+TEST(Compilation, AnonymousStruct_init_index){
+    std::string code =
+R"Code(
+
+    main = function:: int; entry {
+        x = {10, 15} :: {int, int}.
+        x[1]
+    }
+
+)Code";
+
+    std::unique_ptr<PassManager> man(PassManager::prepareForCode(move(code)));
+    int (*main)() = (int (*)()) man->run();
+
+    EXPECT_EQ(15, main());
+}
+
+TEST(Compilation, AnonymousStruct_init_update){
+    std::string code =
+R"Code(
+
+    main = function:: int; entry {
+        x = {10, 15} :: {int, int}.
+        y = x + {6}:: {int, int}.
+        y[0]
+    }
+
+)Code";
+
+    std::unique_ptr<PassManager> man(PassManager::prepareForCode(move(code)));
+    int (*main)() = (int (*)()) man->run();
+
+    EXPECT_EQ(6, main());
+}
+
diff --git a/cpp/tests/types.cpp b/cpp/tests/types.cpp
index d121a48..3fb2d69 100644
--- a/cpp/tests/types.cpp
+++ b/cpp/tests/types.cpp
@@ -1,161 +1,163 @@
 /*
  * types.cpp
  *
  *  Created on: Jun 4, 2015
  *      Author: pgess
  */
 
 #include "gtest/gtest.h"
 #include "passmanager.h"
 #include "llvmlayer.h"
 #include "Parser.h"
 
 using namespace std;
 using namespace xreate;
 
 TEST(Types, DependantTypes1) {
 	string&& code = "XmlNode = type alias {\n"
 			"        tag:: string,\n"
 			"       /* attrs:: [string],*/\n"
 			"        content:: string\n"
 			"}.\n";
 
 	std::unique_ptr<PassManager> program(PassManager::prepareForCode(move(code)));
 	ExpandedType typeXmlNode = program->root->findType("XmlNode");
 
 	ASSERT_EQ(TypeOperator::STRUCT, typeXmlNode->__operator);
 	ASSERT_EQ(2, typeXmlNode->__operands.size());
 	ASSERT_EQ(TypePrimitive::String, typeXmlNode->__operands.at(0).__value);
 	ASSERT_EQ(TypePrimitive::String, typeXmlNode->__operands.at(1).__value);
 }
 
-TEST(Types, DependantTypes2) {
+TEST(Types, DependantTypes_FeatureTypeIndex_2) {
 	string&& code = "XmlNode = type alias {\n"
 			"        tag:: string,\n"
 			"       /* attrs:: [string],*/\n"
 			"        content:: string\n"
 			"}.\n"
 			""
-			"Template = type Template(Leaf) [Leaf, [Leaf[content]]]."
+			"Template = type Template(Leaf) {Leaf, [Leaf[content]]}."
 			"Concrete = type alias Template(XmlNode).";
 
 	std::unique_ptr<PassManager> program(PassManager::prepareForCode(move(code)));
 	ExpandedType typeConcrete = program->root->findType("Concrete");
 
 
-	ASSERT_EQ(TypeOperator::TUPLE, typeConcrete->__operator);
+	ASSERT_EQ(TypeOperator::STRUCT, typeConcrete->__operator);
 	ASSERT_EQ(2, typeConcrete->__operands.size());
 	ASSERT_EQ(TypeOperator::STRUCT, typeConcrete->__operands.at(0).__operator);
 
 	ASSERT_EQ(TypeOperator::ARRAY, typeConcrete->__operands.at(1).__operator);
 	ASSERT_EQ(TypePrimitive::String, typeConcrete->__operands.at(1).__operands.at(0).__value);
 }
 
 TEST(Types, TreeType1) {
 	string&& code = "XmlNode = type alias {\n"
 			"        tag:: string,\n"
 			"       /* attrs:: [string],*/\n"
 			"        content:: string\n"
 			"}.\n"
 			""
-			"Tree = type Tree(Leaf) [Leaf, [Tree(Leaf)]]."
+			"Tree = type Tree(Leaf) {Leaf, [Tree(Leaf)]}."
 			"Concrete = type alias Tree(XmlNode).";
 
 	std::unique_ptr<PassManager> program(PassManager::prepareForCode(move(code)));
 	ExpandedType typeConcrete = program->root->findType("Concrete");
 
-	ASSERT_EQ(TypeOperator::TUPLE, typeConcrete->__operator);
+	ASSERT_EQ(TypeOperator::STRUCT, typeConcrete->__operator);
 	ASSERT_EQ(2, typeConcrete->__operands.size());
 	ASSERT_EQ(TypeOperator::STRUCT, typeConcrete->__operands.at(0).__operator);
 
 	ASSERT_EQ(TypeOperator::ARRAY, typeConcrete->__operands.at(1).__operator);
 
 	auto typeLink = typeConcrete->__operands.at(1).__operands.at(0);
 	ASSERT_EQ(TypeOperator::LINK, typeLink.__operator);
 	ASSERT_EQ(typeConcrete->conjuctionId,typeLink.conjuctionId);
 }
 
 TEST(Types, TreeType1LLvm){
 	string&& code = "XmlNode = type alias {\n"
 			"        tag:: string,\n"
 			"       /* attrs:: [string],*/\n"
 			"        content:: string\n"
 			"}.\n"
 			""
-			"Tree = type Tree(Leaf) [Leaf, [Tree(Leaf)]]."
+			"Tree = type Tree(Leaf) {Leaf, [Tree(Leaf)]}."
 			"Concrete = type alias Tree(XmlNode).";
 
 	std::unique_ptr<PassManager> program(PassManager::prepareForCode(move(code)));
 	ExpandedType typeConcrete = program->root->findType("Concrete");
 
 	llvm::Type* raw = program->llvm->toLLVMType(typeConcrete);
 }
 
 TEST(Types, ArrayOfExternal1){
     FILE* input = fopen("scripts/containers/Containers_Implementation_LinkedList1.xreate","r");
     assert(input != nullptr);
 
     Scanner scanner(input);
     Parser parser(&scanner);
     parser.Parse();
 
     AST& ast = parser.root;
     CodeScope* body = ast.findFunction("test")->getEntryScope();
 
     const ExpandedType& t2 = ast.getType(body->getDeclaration(body->getSymbol("childrenRaw")));
     EXPECT_EQ(t2->__operator, TypeOperator::ARRAY);
 }
 
 TEST(Types, ExternType1){
 	FILE* input = fopen("scripts/containers/Containers_Implementation_LinkedList1.xreate","r");
 	assert(input != nullptr);
 
 	Scanner scanner(input);
 	Parser parser(&scanner);
 	parser.Parse();
 
 	AST& ast = parser.root;
 	CodeScope* body = ast.findFunction("test")->getEntryScope();
 
     const ExpandedType& t2 = ast.getType(body->getDeclaration(body->getSymbol("tree")));
     EXPECT_EQ(t2->__operator, TypeOperator::CUSTOM);
 }
 
 TEST(Types, ast_VariantType1){
 	string&& code =
 			"	colors = type variant (RED, BLUE, GREEN).\n"
 			"	test = function:: colors; entry {GREEN}";
 
 	std::unique_ptr<PassManager> program(PassManager::prepareForCode(move(code)));
 
 	ExpandedType typ = program->root->findType("colors");
 	EXPECT_EQ(TypeOperator::VARIANT, typ->__operator);
 
 	Expression eRed = program->root->findFunction("test")->getEntryScope()->getBody();
 	EXPECT_EQ(Expression::VARIANT, eRed.__state);
 
 	const ExpandedType& typ2 = program->root->getType(eRed);
 	EXPECT_EQ(TypeOperator::VARIANT, typ2->__operator);
 
 	program->run();
 }
 
 TEST(Types, full_VariantType_Switch1){
 	string&& code =
 			"	colors = type variant (RED, BLUE, GREEN).   \n"
 			"	test = function:: colors {GREEN}            \n"
 
 			"main = function:: int; entry {         \n"
 			"	switch(test()):: int    \n"
 			"	case (GREEN) {0}                  \n"
 			"	case default {1}                \n"
 			"}";
 
 	PassManager* man = PassManager::prepareForCode(move(code));
 	int (*main)() = (int (*)()) man->run();
 
 	EXPECT_EQ(0, main());
 }
 
+//TEST(Types, A)
+
 
 //TOTEST string type
diff --git a/scripts/containers/Containers_Implementation_LinkedList1.xreate b/scripts/containers/Containers_Implementation_LinkedList1.xreate
index a645574..30397e5 100644
--- a/scripts/containers/Containers_Implementation_LinkedList1.xreate
+++ b/scripts/containers/Containers_Implementation_LinkedList1.xreate
@@ -1,47 +1,47 @@
 
           // EXTERN INCLUDES
 interface(extern-c){
   xml2 = library:: pkgconfig("libxml-2.0").
   
   include {
     xml2 = ["libxml/tree.h"]
   }.
 } 
 
           // CONTAINERS
 interface(dfa) {
   operator map::  (op(seqaccess)) -> impl(solid).
   operator list_range:: ()->impl(on_the_fly).
   operator list:: ()->impl(solid).
   operator fold:: (op(seqaccess)).
   /* operator index:: (op(randaccess)). - BREAKS THE ANALYSIS. MAKE tree VIEWED AS COLLECTION */ 
   /* operator map:  (op(seqaccess)) -> impl(llvm_array | on_the_fly); */
 }
 
 import raw("core/containers.lp")
 
 
           // PROGRAM
 XmlNode = type alias {
         tag:: string,
        /* attrs:: [string],*/
         content:: string
 }.
 
-Tree = type Tree(Leaf) [Leaf, [Tree(Leaf)]].
+Tree = type Tree(Leaf) {Leaf, [Tree(Leaf)]}.
 XmlTree = type alias Tree(XmlNode).
 
 
 test= function:: num; entry {
     filename = "scripts/containers/Containers_Implementation_LinkedList1-data.xml" :: string.
     docRaw = xmlParseFile(filename) :: xmlDocPtr.
     tree= xmlDocGetRootElement(docRaw) :: xmlNodePtr.
     childrenRaw = tree["children"]:: [xmlNodePtr]; linkedlist(next, null).
     size = loop fold(childrenRaw->child:: xmlNodePtr, 0->count):: int {
       count +1::int
     }.
       
     size
 }