fixed evaluation of properties named property

[machinekoder]

Fixes qmlweb/qmlweb#346

[ChALkeR]

Hm. Linter didn't catch this for some reason, but there is no need for nested ifs here, just use a single one:

      if (S.token.value == "property" &&
          (S.token.type == "name" || S.token.value == "var") &&
          !is_token(peek(), "punc", ":")) {
        next();
        return qmlpropdef();
      }

Upd: ah, we don't have linter enabled in this repo.

[ChALkeR]

Btw, S.token.value == "property" && (S.token.type == "name" || S.token.value == "var") could be reduced to S.token.value == "property" && S.token.type == "name", perhaps this means that there is some other bug somewhere.

[machinekoder]

Good point, token.value should never be property and var at the same time.

[ChALkeR]

LGTM with a nit (unnecessary if nesting).

Thanks!

[ChALkeR]

Thanks, landed in dfbcf70!

There was some more dead code, so I removed all those in a separate commit (eba88a9), and then rebased the actual change from this PR manually.

[machinekoder]

Awesome! When will you publish the next release?

[ChALkeR]

@machinekoder
qmlweb-parser — just published 0.3.1.
qmlweb — not sure yet, I was hoping to finish some more structural changes before 0.2.0, but I might postpone those and release 0.2.0 pretty soon instead.