From 39ff24678af2c3c44718a65409d20fbea56af144 Mon Sep 17 00:00:00 2001 From: "rogerl%netscape.com" Date: Mon, 12 Jun 2000 17:56:05 +0000 Subject: [PATCH] Added check for FORMAT characters in new unicode cr/lf handling code. git-svn-id: svn://10.0.0.236/trunk@72030 18797224-902f-48f8-a5cc-f745e15eee43 --- .../js/rhino/org/mozilla/javascript/LineBuffer.java | 10 ++++++++-- .../rhino/src/org/mozilla/javascript/LineBuffer.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java b/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java index 1da88248370..668b4a2b4c9 100644 --- a/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java +++ b/mozilla/js/rhino/org/mozilla/javascript/LineBuffer.java @@ -92,7 +92,13 @@ final class LineBuffer { && (buffer[offset] != '\u2028') && (buffer[offset] != '\u2029')) { - return (int) buffer[offset++]; + if (Character.getType(buffer[offset]) + == Character.FORMAT) { + hadCFSinceStringStart = true; + offset++; + continue; + } + return (int) buffer[offset++]; } offset++; prevStart = lineStart; @@ -101,7 +107,7 @@ final class LineBuffer { return '\n'; } if ((buffer[offset] >= 128) - && Character.getType(buffer[offset]) == Character.FORMAT) { + && (Character.getType(buffer[offset]) == Character.FORMAT)) { hadCFSinceStringStart = true; offset++; } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java b/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java index 1da88248370..668b4a2b4c9 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/LineBuffer.java @@ -92,7 +92,13 @@ final class LineBuffer { && (buffer[offset] != '\u2028') && (buffer[offset] != '\u2029')) { - return (int) buffer[offset++]; + if (Character.getType(buffer[offset]) + == Character.FORMAT) { + hadCFSinceStringStart = true; + offset++; + continue; + } + return (int) buffer[offset++]; } offset++; prevStart = lineStart; @@ -101,7 +107,7 @@ final class LineBuffer { return '\n'; } if ((buffer[offset] >= 128) - && Character.getType(buffer[offset]) == Character.FORMAT) { + && (Character.getType(buffer[offset]) == Character.FORMAT)) { hadCFSinceStringStart = true; offset++; }