From f4e7261b9f0b4df028fd9854cda15045bcf51ece Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Wed, 23 Jun 2010 14:28:31 +0000 Subject: [PATCH] - tweaked regex to better scan headers (thanks mjaygo!) git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@76 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- auto/generate_test_runner.rb | 2 +- examples/rakefile_helper.rb | 2 +- rakefile_helper.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 5ddf0ab..0845019 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -102,7 +102,7 @@ class UnityTestRunnerGenerator input_file.rewind includes = [] input_file.readlines.each do |line| - scan_results = line.scan(/^#include\s+\"\s*(.+)\.h\s*\"/) + scan_results = line.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/) includes << scan_results[0][0] if (scan_results.size > 0) end return includes diff --git a/examples/rakefile_helper.rb b/examples/rakefile_helper.rb index 0cf386f..d908087 100644 --- a/examples/rakefile_helper.rb +++ b/examples/rakefile_helper.rb @@ -39,7 +39,7 @@ module RakefileHelpers includes = [] lines = File.readlines(filename) lines.each do |line| - m = line.match(/#include \"(.*)\"/) + m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/) if not m.nil? includes << m[1] end diff --git a/rakefile_helper.rb b/rakefile_helper.rb index 9b856b6..a413d58 100644 --- a/rakefile_helper.rb +++ b/rakefile_helper.rb @@ -47,7 +47,7 @@ module RakefileHelpers includes = [] lines = File.readlines(filename) lines.each do |line| - m = line.match(/#include \"(.*)\"/) + m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/) if not m.nil? includes << m[1] end -- GitLab