Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix labels not resolved #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix labels not resolved #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61b9ece
Fix wrong action listener for ButtonSaveAsAction
Gurkonier May 7, 2020
ccf02a9
Fix labels not parsed to address, leading to NumberFormatException
Gurkonier May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/model/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,11 @@ private String[] addressLookup(Token token, int[] flags) {
addresses[i] = token.addrs[i];
break;
case Instruction.FLAG_LABEL:
if (labelMap.get(token.addrs[i]) == null) {
Integer labelAddr = labelMap.get(token.addrs[i]);
if (labelAddr == null) {
throw new CompileException(token.getLineNumber(), "Undefined Label!");
}
addresses[i] = token.addrs[i];
addresses[i] = labelAddr.toString();
break;
default:
break;
Expand Down
8 changes: 4 additions & 4 deletions src/view/JAlphaNotationGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public class JAlphaNotationGUI {
protected JButtonCompileViewActionListener ButtonCompileActionListener;
protected JButtonNewViewActionListener ButtonNewActionListener;
protected JSaveViewActionListener ButtonSaveActionListener;
protected JButtonSaveAsViewActionListener ButtonSaveAsActionListener;
protected JSaveAsViewActionListener ButtonSaveAsActionListener;
protected JLoadViewActionListener ButtonLoadActionListener;
protected JButtonPlayViewActionListener ButtonPlayActionListener;
protected JButtonPauseViewActionListener ButtonPauseActionListener;
Expand Down Expand Up @@ -323,7 +323,7 @@ protected void InitListeners() {
this.ButtonCompileActionListener = new JButtonCompileViewActionListener(this);
this.ButtonNewActionListener = new JButtonNewViewActionListener(this);
this.ButtonSaveActionListener = new JSaveViewActionListener(this);
this.ButtonSaveAsActionListener = new JButtonSaveAsViewActionListener(this);
this.ButtonSaveAsActionListener = new JSaveAsViewActionListener(this);
this.ButtonLoadActionListener = new JLoadViewActionListener(this);
this.ButtonPlayActionListener = new JButtonPlayViewActionListener(this);
this.ButtonPauseActionListener = new JButtonPauseViewActionListener(this);
Expand Down Expand Up @@ -1293,11 +1293,11 @@ public void setButtonSaveActionListener(JSaveViewActionListener buttonSaveAction
ButtonSaveActionListener = buttonSaveActionListener;
}

public JButtonSaveAsViewActionListener getButtonSaveAsActionListener() {
public JSaveAsViewActionListener getButtonSaveAsActionListener() {
return ButtonSaveAsActionListener;
}

public void setButtonSaveAsActionListener(JButtonSaveAsViewActionListener buttonSaveAsActionListener) {
public void setButtonSaveAsActionListener(JSaveAsViewActionListener buttonSaveAsActionListener) {
ButtonSaveAsActionListener = buttonSaveAsActionListener;
}

Expand Down