View | Details | Raw Unified | Return to bug 47800
Collapse All | Expand All

(-)sources/org/apache/batik/css/parser/Scanner.java (-15 / +20 lines)
Lines 21-26 Link Here
21
import java.io.IOException;
21
import java.io.IOException;
22
import java.io.InputStream;
22
import java.io.InputStream;
23
import java.io.Reader;
23
import java.io.Reader;
24
import java.lang.Character;
24
25
25
import org.apache.batik.util.io.NormalizingReader;
26
import org.apache.batik.util.io.NormalizingReader;
26
import org.apache.batik.util.io.StreamNormalizingReader;
27
import org.apache.batik.util.io.StreamNormalizingReader;
Lines 381-401 Link Here
381
                throw new ParseException("character",
382
                throw new ParseException("character",
382
                                         reader.getLine(),
383
                                         reader.getLine(),
383
                                         reader.getColumn());
384
                                         reader.getColumn());
384
            case '-':
385
                nextChar();
386
                if (current != '-') {
387
                    type = LexicalUnits.MINUS;
388
                    return;
389
                }
390
                nextChar();
391
                if (current == '>') {
392
                    nextChar();
393
                    type = LexicalUnits.CDC;
394
                    return;
395
                }
396
                throw new ParseException("character",
397
                                         reader.getLine(),
398
                                         reader.getColumn());
399
            case '|':
385
            case '|':
400
                nextChar();
386
                nextChar();
401
                if (current == '=') {
387
                if (current == '=') {
Lines 751-756 Link Here
751
                }
737
                }
752
                type = LexicalUnits.IDENTIFIER;
738
                type = LexicalUnits.IDENTIFIER;
753
                return;
739
                return;
740
            case '-':
741
                nextChar();
742
                if (current != '-') {
743
                    if(Character.isDigit(current) || ScannerUtilities.isCSSSpace((char)current)) {
744
                        type = LexicalUnits.MINUS;
745
                        return;
746
                    }
747
                } else {
748
                    nextChar();
749
                    if (current == '>') {
750
                        nextChar();
751
                        type = LexicalUnits.CDC;
752
                        return;
753
                    }
754
                    throw new ParseException("character",
755
                                           reader.getLine(),
756
                                           reader.getColumn());
757
                }
758
            //$FALL-THROUGH$
754
            default:
759
            default:
755
                if (current == '\\') {
760
                if (current == '\\') {
756
                    do {
761
                    do {

Return to bug 47800