260955 - XUL preprocessor should apply filters to #include @VAR@/somepath

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Benjamin Smedberg]

For localization stuff, I want to apply filters to the path given in #include
directives:

#include @VAR@/path

Patch forthwith.

Comment 1

[Benjamin Smedberg]

Attachment: preprocess #include directive param

Comment 2

[Benjamin Smedberg]

Comment on attachment 159723 [details] [diff] [review]
preprocess #include directive param

Hixie, feel free to steal this review from bryner.

Comment 3

[Hixie (not reading bugmail)]

Do we really want it to work like that?

Comment 4

[Benjamin Smedberg]

I do. See the dependent bug, I'm doing

#include @AB_CD@/extra-jar.mn

Simply allowing substitution in the #include directive would also suit my needs.

Comment 5

[Hixie (not reading bugmail)]

The problem I see is that it would be very unintuitive. For example,

#include foo  bar.inc

...might include foo\ \ bar.inc, or might include foo\ bar.inc, you can't tell
from just looking at the line, you have to know what the arguments sent to the
preprocessor were.

I would rather we do something like this:

#substinclude @FOO@/bar.inc

...or some such. (I don't like the name "#substinclude" though.)

Comment 6

[Hixie (not reading bugmail)]

maybe #include-with-variables or something like that?

Comment 7

[Benjamin Smedberg]

Attachment: add an #includesubst filter

Comment 8

[Benjamin Smedberg]

Comment on attachment 160230 [details] [diff] [review]
add an #includesubst filter

I couldn't do #include-subst because that's not a legal perl identifier.

Comment 9

[Hixie (not reading bugmail)]

>  (my $arg = shift) =~ s/@(\w+)@/$stack->get($1, 1)/gose;;
>  my $filename = File::Spec::_0_8::catpath(File::Spec::_0_8::splitpath($arg));

...would be better as:

  my($filename) = @_;
  # substitute occurances of @var@ with the relevant variable
  $filename =~ s/@(\w+)@/$stack->get($1, 1)/gose;
  $filename = File::Spec::_0_8::catpath(File::Spec::_0_8::splitpath($filename));

Pity about the growing code duplication. I should go through the preprocessor
and fix some of that (and make the code generally more readable) at some point.

Comment 10

[Benjamin Smedberg]

Fix checked in on trunk and branch, with changes specified by Ian.