[svn-commits] murf: branch murf/fast-ast r41259 - in /team/murf/fast-ast: pbx/ael/ utils/

[svn-commits at lists.digium.com]

Author: murf
Date: Mon Aug 28 19:02:15 2006
New Revision: 41259

URL: http://svn.digium.com/view/asterisk?rev=41259&view=rev
Log:
Hmmm. automerge failed. commit this morn's work so I can get
svnmerge going to get automerge going again.


Modified:
    team/murf/fast-ast/pbx/ael/ael.flex
    team/murf/fast-ast/utils/ael_main.c

Modified: team/murf/fast-ast/pbx/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/pbx/ael/ael.flex?rev=41259&r1=41258&r2=41259&view=diff
==============================================================================
--- team/murf/fast-ast/pbx/ael/ael.flex (original)
+++ team/murf/fast-ast/pbx/ael/ael.flex Mon Aug 28 19:02:15 2006
@@ -26,7 +26,7 @@
  *
  * %x describes the contexts we have: paren, semic and argg, plus INITIAL
  */
-%x paren semic argg
+%x paren semic argg comment
 
 /* prefix used for various globally-visible functions and variables.
  * This renames also yywrap, but since we do not use it, we just
@@ -171,6 +171,8 @@
 NOSEMIC		([^;()\{\}\[\]]|\\[;()\[\]\{\}])*
 
 %%
+
+"/*"         {BEGIN(comment);my_col+=yyleng;}
 
 \{		{ STORE_POS; return LC;}
 \}		{ STORE_POS; return RC;}
@@ -437,6 +439,14 @@
 		}
 	}
 
+
+<comment>[^*\n]*	 	{mycol+=yyleng;}
+<comment>[^*\n]*\n      {++my_lineno;my_col = 1;}
+<comment>"*"+[^*/\n]*	{mycol+=yyleng;}
+<comment>"*"+[^*/\n]*\n {++my_lineno;my_col = 1;}
+<comment>"*/"        {mycol+=yyleng;BEGIN(INITIAL);}
+
+
 <<EOF>>		{
 		if ( --include_stack_index < 0 ) {
 			yyterminate();

Modified: team/murf/fast-ast/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/utils/ael_main.c?rev=41259&r1=41258&r2=41259&view=diff
==============================================================================
--- team/murf/fast-ast/utils/ael_main.c (original)
+++ team/murf/fast-ast/utils/ael_main.c Mon Aug 28 19:02:15 2006
@@ -424,7 +424,7 @@
 
 
 extern struct module_symbols mod_data;
-extern ael_external_load_module(void);
+extern int ael_external_load_module(void);
 
 int main(int argc, char **argv)
 {