CUP_history: 
--------------------------------------------------------------------------------------------------------------------

cup_circus.v4.5.1: 	Tree of inner_form is fixed, my tests are running perfectly (with the 4 old errors).
cup_circus.v4.6.1: 	outer_form is fixed, TODO's comments cleaned, uses CircusParserUtil.
cup_circus.v4.7.1: 	conjecture, PrefixExpressionMounter etc. uncommented, changed func_appl to TermA
					I've moved some of the parser methods to CircusParserUtil.
				
24 conflicts				
			
--------------------------------------------------------------------------------------------------------------------		
cup_circus.v4.8.1:	ATTEMPTS ON MODIFICATION IN THE SYNTAX
--------------------------------------------------------------------------------------------------------------------

- Adding func_appl productions for chanSetPara and nsExpr -> 125/140
- (schema) negation - Mudei no else de expr -> pred
- Adding Assumption and coercion -> 129/144
- Taking away func_appl productions for chanSetPara and nsExpr -> 28/43
- Adding N [ Exp+ ] in proc -> 28/43 (no changes)
- Taking away proc [ Exp+ ] in proc -> 28/43 (no changes)
- Adding proc LPAR csExp BAR csExp RPAR in proc -> 28/43 (no changes)
- Adding two new ProcessRI productions in proc -> 28/43 (no changes)
- Adding two new ProcessR productions in proc -> 28/43 (no changes)
- Adding four new Action productions in cspActExp -> 39/54
- Adding six new ActionR productions in cspActExp -> 39/54

--------------------------------------------------------------------------------------------------------------------
cup_circus.v4.9: 	
--------------------------------------------------------------------------------------------------------------------

- Several modification by Leo. Most important modification was in callAction -> 99 conflicts

--------------------------------------------------------------------------------------------------------------------
cup_circus.v4.10:
--------------------------------------------------------------------------------------------------------------------

- Substituting the let definition construction by the one of CZT -> 99/114 (no changes).

--------------------------------------------------------------------------------------------------------------------
cup_circus.v5.0:
--------------------------------------------------------------------------------------------------------------------

- Modification of the Java Code by Leo, few modifications on the productions.

99 conflicts

--------------------------------------------------------------------------------------------------------------------       
cup_circus.v6.0, cup_circus.v7.0: 
--------------------------------------------------------------------------------------------------------------------
        
- Taking away 10 productions (parallel) + callAction production in cspActExp -> 28  
- Bringing again the 2 take_this_away productions of cspActExp -> 28
- Taking away 5 new productions in proc -> 28
- Bringing again the 2 take_this_away productions of proc -> 28
- Taking N [ Exp+ ] -> 28

    Error(s) for T_Simple.tex
        Syntax error near ',' at line 26

- Taking assumption and coertion -> 24

    Error(s) for T_Simple.tex 
        Syntax error near ',' at line 26
        
- Voltando para identList ao inves de refNameList em csExp.    
    
- Coloquei de volta LPAREN circdecl:cd ODOT procDesc:p RPAREN LFL term_list:fl RFL, que Leo havia comentado.

    Error(s) for T_Simple.tex 
        Syntax error near '@' at line 115

- Coloquei de volta LPAREN circdecl:cd SPOT procDesc:p RPAREN LPAREN term_list:fl RPAREN

    Error(s) for T_Simple.tex 
        Syntax error near ',' at line 123. Este erro eu nao consegui tirar.
			
Conclusao:  cup_circus.v7.0 aceita T_Simples retirando-se o Rename.

Terminou com 24 conflitos.

--------------------------------------------------------------------------------------------------------------------
cup_circus.v8.0: 
--------------------------------------------------------------------------------------------------------------------

Inicialmente com 24 conflitos.

- Tirei term de act. -> 15
- Coloquei de volta IDENT EM cspActExp -> 30

    Isto foi feito para se tirar o conflito ne Schema-Exp (SchExprAction) com N (CallAction) na producao de Action.

--------------------------------------------------------------------------------------------------------------------
cup_circus.v9.0: 
--------------------------------------------------------------------------------------------------------------------

Inicialmente com 30 conflitos.

- Acrescentei um branch em state_def, para horizontal definition. -> 30
- Mudei o tipo de unboxed_def para AxPara.
- Mudei codigo java para tratar a nova gramatica: state definitions agora sao um ZPara (schema ou horiz. def.).
- Consertei codigo java. Em createParamAction eu tirei ".getCircusAction()".

--------------------------------------------------------------------------------------------------------------------
cup_circus.v5.1:
--------------------------------------------------------------------------------------------------------------------

Inicialmente com 99 conflitos. Feito a partir da v5.0.

- Voltando para identList ao inves de refNameList em csExp -> 99

- Coloquei de volta LPAREN circdecl:cd ODOT procDesc:p RPAREN LFL term_list:fl RFL, que Leo havia comentado.
  e coloquei de volta LPAREN circdecl:cd SPOT procDesc:p RPAREN LPAREN term_list:fl RPAREN 
  e comentario do codigo java destes dois branches -> 99

- Tirei term de act. -> 45

- Fiz as mesmas modificacoes listadas em cup_circus.v9.0 -> 45




--------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------

teste_cup_circus.v1.0.cup:	Only Z part, without any conflict.

teste_cup_circus.v2.0.cup: 

- Z Part + program, circPar_list, circPar (this last one without chanPara,
chaSetPara and procPara productions) -> 0/0

- chanPara, cDecl, simDecl and ident_list + chanPara production in circPar -> 5/5

	The problem was due to 'expression' production in simCDecl.
	
- Taking away 'expression' production in SimCDecl -> 0/0

