Merge branch 'mc' into mc++

[simgrid.git] / src / xbt / automaton / parserPromela.yacc

diff --git a/src/xbt/automaton/parserPromela.yacc b/src/xbt/automaton/parserPromela.yacc
index 6c6ae1f..57468b6 100644 (file)
--- a/src/xbt/automaton/parserPromela.yacc
+++ b/src/xbt/automaton/parserPromela.yacc
@@ -1,8 +1,13 @@
+/* Copyright (c) 2012-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 %{
 
-#include "automaton_parse.yy.c"
+#include "automaton_lexer.yy.c"
 #include <xbt/automaton.h>
-#include <xbt/automatonparse_promela.h>
 
 void yyerror(const char *s);
 
@@ -12,7 +17,7 @@ void yyerror(const char *s);
   double real;
   int integer;
   char* string;
-  xbt_exp_label_t label;
+  xbt_automaton_exp_label_t label;
 }
 
 %token NEVER