From eeb798f76c760c39fed31318d1193ed3e93316aa Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 15 Apr 2015 23:34:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D1=81=D0=B2=D0=B0=D0=B8=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/annimon/everlastingsummer/Parser.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/com/annimon/everlastingsummer/Parser.java b/src/com/annimon/everlastingsummer/Parser.java index f9c4c06..e8a23c4 100644 --- a/src/com/annimon/everlastingsummer/Parser.java +++ b/src/com/annimon/everlastingsummer/Parser.java @@ -3,6 +3,7 @@ package com.annimon.everlastingsummer; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.annimon.everlastingsummer.ast.*; import android.text.TextUtils; /** @@ -46,6 +47,7 @@ public final class Parser { labels = new HashMap(); hasEndMenu = false; preScan(); + Variables.init(); } public List getTokens() { @@ -191,6 +193,14 @@ public final class Parser { private boolean command() { final Token token = get(0); + if (match(token, TokenType.WORD)) { + if (match(TokenType.EQ)) { + // variable = expression + Variables.setVariable(token.getText(), expression().eval()); + return false; + } + } + if (match(token, TokenType.RENPY_PAUSE)) { consume(TokenType.LPAREN); final double pause = consumeDouble(); @@ -353,6 +363,18 @@ public final class Parser { return false; } + private Expression expression() { + return primary(); + } + + private Expression primary() { + final Token current = get(0); + if (match(current, TokenType.WORD)) { + return new VariableExpression(current.getText()); + } + throw new RuntimeException(); + } + private void preScan() { // Сканируем все метки, для быстрого перехода командой jump. // А также определяем параметры для оптимизации.