Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a5b16cf authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4084 

* changes:
  Handle end-of-file inside of comments, local declarations.
parents befe95bf 22e3e8e1

libacc/acc.cpp

+7 −4
Original line number Diff line number Diff line
@@ -1995,18 +1995,21 @@ class Compiler : public ErrorSink { 
                }

            } else if ((tok == '/') & (ch == '*')) {

                inp();

                while (ch) {

                    while (ch != '*')

                while (ch && ch != EOF) {

                    while (ch != '*' && ch != EOF)

                        inp();

                    inp();

                    if (ch == '/')

                        ch = 0;

                }

                if (ch == EOF) {

                    error("End of file inside comment.");

                }

                inp();

                next();

            } else if ((tok == '/') & (ch == '/')) {

                inp();

                while (ch && (ch != '\n')) {

                while (ch && (ch != '\n') && (ch != EOF)) {

                    inp();

                }

                inp();
@@ -2489,7 +2492,7 @@ class Compiler : public ErrorSink { 
        Type base;



        while (acceptType(base)) {

            while (tok != ';') {

            while (tok != ';' && tok != EOF) {

                Type t = acceptPointerDeclaration(t);

                addLocalSymbol();

                if (tok) {