From b2cfbe23c556411df5d2c9a67a9ad9bc1a462865 Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Tue, 30 Apr 2019 21:58:19 +0100 Subject: [PATCH] Fixed not parsing function names containing numbers --- Generator/CodeParser/ParseClasses.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Generator/CodeParser/ParseClasses.cs b/Generator/CodeParser/ParseClasses.cs index 9eb50b3..5ebc6a7 100644 --- a/Generator/CodeParser/ParseClasses.cs +++ b/Generator/CodeParser/ParseClasses.cs @@ -35,7 +35,7 @@ namespace Generator var lines = inner.Split( new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries ); - var func = new Regex( @"virtual (.+[\t |\*])([a-zA-Z]+?)\((.+?)?\) = 0 ?;" ); + var func = new Regex( @"virtual (.+[\t |\*])([a-z0-9A-Z]+?)\((.+?)?\) = 0 ?;$" ); var c = new Class(); c.Name = classname; @@ -54,7 +54,11 @@ namespace Generator foreach ( var linestr in lines ) { - var line = linestr; + var line = linestr.Trim(); + + var commentPos = line.IndexOf( "//" ); + if ( commentPos > 0 ) + line = line.Substring( 0, commentPos-1 ).Trim(); if ( line.Trim().Length < 4 ) continue; if ( line.Trim().StartsWith( "public:" ) ) continue;