r20563: Start using the new parser in ParseExpr(). It's now trivial to use this

to check for NULL pointers when pointers are being dereferenced (#4218).

There are exactly 500 tests for pidl now :-)
(This used to be commit d3146f3bcd4541f890d6c1b072ff34853e9239d2)

1 files changed, 12 insertions, 13 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Util.pm b/source4/pidl/lib/Parse/Pidl/Util.pm
index 064862b7c5..2f3547bbb5 100644
--- a/source4/pidl/lib/Parse/Pidl/Util.pm
+++ b/source4/pidl/lib/Parse/Pidl/Util.pm
@@ -12,6 +12,8 @@ $VERSION = '0.01';
 
 use strict;
 
+use Parse::Pidl::Expr;
+
 #####################################################################
 # a dumper wrapper to prevent dependence on the Data::Dumper module
 # unless we actually need it
@@ -97,22 +99,19 @@ sub useUintEnums()
 
 sub ParseExpr($$)
 {
-	my($expr,$varlist) = @_;
+	my($expr, $varlist) = @_;
 
 	die("Undefined value in ParseExpr") if not defined($expr);
 
-	my @tokens = split /((?:[A-Za-z_])(?:(?:(?:[A-Za-z0-9_.])|(?:->))+)?)/, $expr;
-	my $ret = "";
-
-	foreach my $t (@tokens) {
-		if (defined($varlist->{$t})) {
-			$ret .= $varlist->{$t};
-		} else {
-			$ret .= $t;
-		}
-	}
-
-	return $ret;
+	my $x = new Parse::Pidl::Expr();
+	
+	return $x->Run($expr, sub { my $x = shift; die(MyDumper($x)); },
+		# Lookup fn 
+		sub { my $x = shift; 
+			  return($varlist->{$x}) if (defined($varlist->{$x})); 
+			  return $x;
+		  },
+		undef);
 }
 
 1;