797794 - Preprocessor.py -Fslashslash does'nt work

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[teramako]

User Agent: Opera/9.80 (Windows NT 5.1; U; Edition Next; ja) Presto/2.11.310 Version/12.50

Steps to reproduce:

python Preprocessor.py -Fslashslash doesn't work


Actual results:

$ cat test.js
// comment

$ python Preprocessor.py -Fslashslash test.js

Traceback (most recent call last):
  File "Preprocessor.py", line 475, in <module>
    main()
  File "Preprocessor.py", line 460, in main
    pp.handleCommandLine(None, True)
  File "Preprocessor.py", line 157, in handleCommandLine
    self.do_include(f, False)
  File "Preprocessor.py", line 445, in do_include
    self.handleLine(l)
  File "Preprocessor.py", line 226, in handleLine
    self.write(aLine)
  File "Preprocessor.py", line 136, in write
    filteredLine = self.applyFilters(aLine)
  File "Preprocessor.py", line 121, in applyFilters
    aLine = f[1](aLine)
  File "Preprocessor.py", line 385, in filter_slashslash
    [aLine, rest] = aLine.split('//', 1)
ValueError: need more than 1 value to unpack

Comment 1

[teramako]

Attachment: test script

Comment 2

[ABE Hiroki (:hATrayflood)]

this error caused by blank line with -Fslashslash option.
double slashed comment does not related.

Comment 3

[Taro Matsuzawa]

Attachment: Fix for -Fslashslash option.

Comment 4

[Masatoshi Kimura [:emk]]

You need to assign a reviewer. (Maybe Ted?)

Comment 5

[(not currently active) Ted Mielczarek]

Comment on attachment 670235 [details] [diff] [review]
Fix for -Fslashslash option.

Review of attachment 670235 [details] [diff] [review]:
-----------------------------------------------------------------

Sorry for the review delay! This is fine, but it would be nice to have a unit test for it.

Comment 6

[Makoto Kato [:m_kato]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/1b344f7a2e81

Comment 7

[Makoto Kato [:m_kato]]

bustage fix (we have to sync config/* and js/src/config/*)
https://hg.mozilla.org/integration/mozilla-inbound/rev/30366a70c015

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/1b344f7a2e81
https://hg.mozilla.org/mozilla-central/rev/30366a70c015