Hash :
26e355b8
Author :
Date :
2015-08-14T14:16:19
Add full support for line continuation in the preprocessor
Re-landing earlier change with constant signedness fixed (was causing
build issues on Linux).
Line continuation in ESSL 3.00 needs to be processed before tokenization,
since tokens can span the line continuation. On the other hand, ANGLE's
tokenizer keeps track of line numbers, and whenever a line continuation
appears the line number still needs to be incremented by one, just like
on a regular newline.
That's why line continuation is now implemented as follows: when the
shader strings are concatenated in Input, they are also checked for line
continuation. Whenever line continuation is encountered, the string
is cut before that point. When the tokenizer asks for more input, the
string starting from the character after line continuation is passed
to it, and the line number is incremented from Input. This way the
tokenizer can parse tokens that span multiple lines - it never sees the
line continuation - but still keeps track of the line number correctly.
Relevant spec is in ESSL 3.00 section 3.2 "Source strings".
Support for line continuation also applies to ESSL 1.00. ESSL 3.00
spec section 1.5 says that line continuation support is mandated when
an ESSL 1.00 shader is used with the OpenGL ES 3.0 API, and is optional
when ESSL 1.00 is used with the OpenGL ES 2.0 API.
TEST=dEQP-GLES3.functional.shaders.preprocessor.line_continuation.*
(all pass),
angle_unittests
BUG=angleproject:1125
Change-Id: Ic086aacac53cd75bf93c0fda782416501d2f842b
Reviewed-on: https://chromium-review.googlesource.com/294200
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178
//
// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "PreprocessorTest.h"
#include "Input.h"
#include "Token.h"
class InitTest : public PreprocessorTest
{
};
TEST_F(InitTest, ZeroCount)
{
EXPECT_TRUE(mPreprocessor.init(0, NULL, NULL));
pp::Token token;
mPreprocessor.lex(&token);
EXPECT_EQ(pp::Token::LAST, token.type);
}
TEST_F(InitTest, NullString)
{
EXPECT_FALSE(mPreprocessor.init(1, NULL, NULL));
}
TEST(InputTest, DefaultConstructor)
{
pp::Input input;
EXPECT_EQ(0u, input.count());
int lineNo = 0;
EXPECT_EQ(0u, input.read(NULL, 1, &lineNo));
}
TEST(InputTest, NullLength)
{
const char* str[] = {"foo"};
pp::Input input(1, str, NULL);
EXPECT_EQ(3u, input.length(0));
}
TEST(InputTest, NegativeLength)
{
const char* str[] = {"foo"};
int length[] = {-1};
pp::Input input(1, str, length);
EXPECT_EQ(3u, input.length(0));
}
TEST(InputTest, ActualLength)
{
const char* str[] = {"foobar"};
int length[] = {3};
pp::Input input(1, str, length);
// Note that strlen(str[0]) != length[0].
// Even then Input should just accept any non-negative number.
EXPECT_EQ(static_cast<size_t>(length[0]), input.length(0));
}
TEST(InputTest, String)
{
const char* str[] = {"foo"};
pp::Input input(1, str, NULL);
EXPECT_STREQ(str[0], input.string(0));
}
TEST(InputTest, ReadSingleString)
{
int count = 1;
const char* str[] = {"foo"};
char buf[4] = {'\0', '\0', '\0', '\0'};
int maxSize = 1;
int lineNo = 0;
pp::Input input1(count, str, NULL);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('f', buf[0]);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(0u, input1.read(buf, maxSize, &lineNo));
maxSize = 2;
pp::Input input2(count, str, NULL);
EXPECT_EQ(2u, input2.read(buf, maxSize, &lineNo));
EXPECT_STREQ("fo", buf);
EXPECT_EQ(1u, input2.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(0u, input2.read(buf, maxSize, &lineNo));
maxSize = 3;
pp::Input input3(count, str, NULL);
EXPECT_EQ(3u, input3.read(buf, maxSize, &lineNo));
EXPECT_STREQ("foo", buf);
EXPECT_EQ(0u, input3.read(buf, maxSize, &lineNo));
maxSize = 4;
pp::Input input4(count, str, NULL);
EXPECT_EQ(3u, input4.read(buf, maxSize, &lineNo));
EXPECT_STREQ("foo", buf);
EXPECT_EQ(0u, input4.read(buf, maxSize, &lineNo));
}
TEST(InputTest, ReadMultipleStrings)
{
int count = 3;
const char* str[] = {"f", "o", "o"};
char buf[4] = {'\0', '\0', '\0', '\0'};
int maxSize = 1;
int lineNo = 0;
pp::Input input1(count, str, NULL);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('f', buf[0]);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(0u, input1.read(buf, maxSize, &lineNo));
maxSize = 2;
pp::Input input2(count, str, NULL);
EXPECT_EQ(2u, input2.read(buf, maxSize, &lineNo));
EXPECT_STREQ("fo", buf);
EXPECT_EQ(1u, input2.read(buf, maxSize, &lineNo));
EXPECT_EQ('o', buf[0]);
EXPECT_EQ(0u, input2.read(buf, maxSize, &lineNo));
maxSize = 3;
pp::Input input3(count, str, NULL);
EXPECT_EQ(3u, input3.read(buf, maxSize, &lineNo));
EXPECT_STREQ("foo", buf);
EXPECT_EQ(0u, input3.read(buf, maxSize, &lineNo));
maxSize = 4;
pp::Input input4(count, str, NULL);
EXPECT_EQ(3u, input4.read(buf, maxSize, &lineNo));
EXPECT_STREQ("foo", buf);
EXPECT_EQ(0u, input4.read(buf, maxSize, &lineNo));
}
TEST(InputTest, ReadStringsWithLength)
{
int count = 2;
const char* str[] = {"foo", "bar"};
// Note that the length for the first string is 2 which is less than
// strlen(str[0]. We want to make sure that the last character is ignored.
int length[] = {2, 3};
char buf[6] = {'\0', '\0', '\0', '\0', '\0', '\0'};
size_t maxSize = 5;
int lineNo = 0;
pp::Input input(count, str, length);
EXPECT_EQ(maxSize, input.read(buf, maxSize, &lineNo));
EXPECT_STREQ("fobar", buf);
}
TEST(InputTest, ReadStringsWithLineContinuation)
{
int count = 2;
const char* str[] = {"foo\\", "\nba\\\r\nr"};
int length[] = {4, 7};
char buf[11] = {'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'};
size_t maxSize = 11;
int lineNo = 0;
pp::Input input(count, str, length);
EXPECT_EQ(3u, input.read(buf, maxSize, &lineNo));
EXPECT_EQ(0, lineNo);
EXPECT_EQ(2u, input.read(buf + 3, maxSize - 3, &lineNo));
EXPECT_EQ(1, lineNo);
EXPECT_EQ(1u, input.read(buf + 5, maxSize - 5, &lineNo));
EXPECT_EQ(2, lineNo);
EXPECT_STREQ("foobar", buf);
}