restore v1.0.3

Author: idleberg

examples/Factorial.nsl

@@ -13,7 +13,7 @@ function fact($n)
   return $n * fact($n - 1);
 }
 
-section Fib()
+section Factorial()
 {
   #define Factorial 4
   DetailPrint("fact(".Factorial.") = ".fact(Factorial));

examples/Install.nsl

@@ -1,4 +1,4 @@
-#define Version '1.0.2'
+#define Version '1.0.3'
 
 Name("nsL Assembler ".Version." (Alpha)");
 OutFile("nsL-Assembler-".Version.".exe");
@@ -18,8 +18,10 @@ function .onInit()
   $INSTDIR = ReadRegStr("HKLM", @"Software\NSIS", "");
   if (StrCmp($INSTDIR, ""))
   {
-    MessageBox("MB_OK|MB_ICONEXCLAMATION", "NSIS is not installed on this machine. Setup will now exit.");
-    Abort();
+    if (MessageBox("MB_YESNO|MB_ICONEXCLAMATION", "NSIS is not installed on this machine. Would you like to continue anyway?") == "IDNO")
+      Abort();
+
+    $INSTDIR = $PROGRAMFILES.@"\NSIS";
   }
 }
 
@@ -31,8 +33,8 @@ section Install("nsL Assembler", true)
 
   // Extract documents.
   SetOutPath($INSTDIR."\\Docs\\NSL");
-  File(@"..\..\Reference.pdf");
-  File(@"..\..\functions.txt");
+  File(@"..\docs\Reference.pdf");
+  File(@"..\docs\functions.txt");
 
   // Add the right click "Compile nsL Script" option.
   WriteRegStr("HKCR", ".nsl", "", "nsL.Script");
@@ -77,7 +79,7 @@ section Source("Java Source Code", false, true)
   FileRecursive(@"..\test");
   File(@"..\build.xml");
   File(@"..\manifest.mf");
-  File(@"..\..\Reference.docx");
+  File(@"..\docs\Reference.docx");
 }
 
 uninstall function .onInit()

examples/Plugins.nsl

@@ -0,0 +1,10 @@
+OutFile("Test.exe");
+ShowInstDetails("show");
+XPStyle("on");
+RequestExecutionLevel("admin");
+
+section Test()
+{
+  $R0 = NSISdl::download("http://nsis.sourceforge.net/mediawiki/images/4/44/NSISArray.zip", $EXEDIR.@"\NSISArray.zip");
+  DetailPrint($R0);
+}

examples/Test.nsl

@@ -5,4 +5,16 @@ RequestExecutionLevel("admin");
 
 section Test()
 {
+if (MessageBox("MB_YESNO", "Click Yes or No...") == "IDYES")
+  DetailPrint("You clicked Yes!");
+switch (MessageBox("MB_YESNO", "Click Yes or No...") == "IDYES")
+{
+  case true:
+    DetailPrint("You clicked Yes!");
+    break;
+  case false:
+    DetailPrint("You clicked No!");
+    break;
+}
+
 }

nbproject/private/private.xml

@@ -3,9 +3,9 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1">
         <file>
             <url>src/nsl/expression/Expression.java</url>
-            <line>464</line>
-            <line>628</line>
-            <line>1345</line>
+            <line>468</line>
+            <line>632</line>
+            <line>1349</line>
         </file>
     </editor-bookmarks>
 </project-private>

src/nsl/Tokenizer.java

@@ -17,7 +17,6 @@ public class Tokenizer extends StreamTokenizer
   private final Reader theReader;
   private final String source;
 
-  private int prevLineNo;
   private int lineNumberAdd;
   private boolean autoPop;
 
@@ -52,7 +51,6 @@ public Tokenizer(Reader reader, String source)
     this.theReader = reader;
     this.source = source;
 
-    this.prevLineNo = 0;
     this.lineNumberAdd = 0;
     this.autoPop = true;
   }
@@ -75,15 +73,6 @@ public String getSource()
     return this.source;
   }
 
-  /**
-   * Gets the line number that a token was read from previously.
-   * @return the line number that a token was read from previously
-   */
-  public int linenoprev()
-  {
-    return this.prevLineNo;
-  }
-
   /**
    * Returns the current line number.
    * @return the current line number
@@ -226,7 +215,7 @@ public String readUntil(String match)
    * Gets the next token.
    * @return <code>true</code> if there was another token
    */
-  public boolean tokenNext() throws NslExpectedException, NslException
+  public boolean tokenNext()
   {
     return this.tokenNext(null);
   }
@@ -236,9 +225,8 @@ public boolean tokenNext() throws NslExpectedException, NslException
    * @param expected the message of the exception to throw if no token exists
    * @return <code>true</code> if there was another token
    */
-  public boolean tokenNext(String expected) throws NslExpectedException, NslException
+  public boolean tokenNext(String expected)
   {
-    this.prevLineNo = lineno();
     try
     {
       boolean result = this.nextToken() != TT_EOF;
@@ -310,7 +298,7 @@ public boolean tokenNext(String expected) throws NslExpectedException, NslExcept
    * Returns the current token as a string.
    * @return the current token as a string
    */
-  public String tokenToString()
+  /*public String tokenToString()
   {
     if (this.tokenIsWord())
       return this.sval;
@@ -319,13 +307,13 @@ public String tokenToString()
     if (this.tokenIsString())
       return '"' + this.sval + '"';
     return Character.toString((char)this.ttype);
-  }
+  }*/
 
   /**
    * Matches the given character and prints an error otherwise.
    * @param c the character to match
    */
-  public void matchOrDie(char c) throws NslExpectedException, NslException
+  public void matchOrDie(char c)
   {
     if (!this.tokenIs(c))
       throw new NslExpectedException("\"" + c + "\"");
@@ -336,7 +324,7 @@ public void matchOrDie(char c) throws NslExpectedException, NslException
    * Matches the given word and prints an error otherwise.
    * @param word the word to match
    */
-  public void matchOrDie(String word) throws NslExpectedException, NslException
+  public void matchOrDie(String word)
   {
     if (!this.tokenIs(word))
       throw new NslExpectedException("\"" + word + "\"");
@@ -348,7 +336,7 @@ public void matchOrDie(String word) throws NslExpectedException, NslException
    * @param c the character to match
    * @return <code>true</code> on success
    */
-  public boolean match(char c) throws NslException
+  public boolean match(char c)
   {
     if (this.tokenIs(c))
     {
@@ -363,7 +351,7 @@ public boolean match(char c) throws NslException
    * @param word the word to match
    * @return <code>true</code> on success
    */
-  public boolean match(String word) throws NslException
+  public boolean match(String word)
   {
     if (this.tokenIs(word))
     {
@@ -377,9 +365,9 @@ public boolean match(String word) throws NslException
    * Matches a semicolon on the end of the current line or prints an error
    * otherwise.
    */
-  public void matchEolOrDie() throws NslExpectedException, NslException
+  public void matchEolOrDie()
   {
-    if (!this.tokenIs(';') || this.lineno() != this.prevLineNo)
+    if (!this.tokenIs(';'))
       throw new NslExpectedException("\";\"");
     this.tokenNext();
   }
@@ -389,7 +377,7 @@ public void matchEolOrDie() throws NslExpectedException, NslException
    * @return the word if the current token was a word, or <code>null</code>
    * otherwise
    */
-  public String matchAWord() throws NslException
+  public String matchAWord()
   {
     return this.matchAWord(null);
   }
@@ -400,7 +388,7 @@ public String matchAWord() throws NslException
    * @return the word if the current token was a word, or <code>null</code>
    * otherwise
    */
-  public String matchAWord(String expected) throws NslException
+  public String matchAWord(String expected)
   {
     if (this.tokenIsWord())
     {
@@ -418,7 +406,7 @@ public String matchAWord(String expected) throws NslException
    * @return the string if the current token was a string, or <code>null</code>
    * otherwise
    */
-  public String matchAString() throws NslException
+  public String matchAString()
   {
     return this.matchAString(null);
   }
@@ -429,7 +417,7 @@ public String matchAString() throws NslException
    * @return the string if the current token was a string, or <code>null</code>
    * otherwise
    */
-  public String matchAString(String expected) throws NslException
+  public String matchAString(String expected)
   {
     if (this.tokenIsString())
     {

src/nsl/expression/BooleanExpression.java

@@ -29,7 +29,7 @@ protected BooleanExpression()
    */
   public BooleanExpression(Expression leftOperand, String operator, Expression rightOperand)
   {
-    super(leftOperand, new Operator(operator, OperatorType.Mathematical), rightOperand);
+    super(leftOperand, operator, rightOperand);
 
     if (!isBooleanExpression(leftOperand))
       throw new NslException("The left operand must be an equality or relational expression", true);
@@ -106,7 +106,7 @@ public void assemble(Label gotoA, Label gotoB) throws IOException
 
     if (this.leftOperand instanceof ComparisonExpression && this.rightOperand instanceof ComparisonExpression)
     {
-      if (this.operator.getOperator().equals("&&"))
+      if (this.operator.equals("&&"))
       {
         ((ConditionalExpression)this.leftOperand).assemble(RelativeJump.Zero, gotoB);
         ((ConditionalExpression)this.rightOperand).assemble(gotoA, gotoB);
@@ -119,7 +119,7 @@ public void assemble(Label gotoA, Label gotoB) throws IOException
     }
     else if (this.leftOperand instanceof ComparisonExpression)
     {
-      if (this.operator.getOperator().equals("&&"))
+      if (this.operator.equals("&&"))
       {
         ((ConditionalExpression)this.leftOperand).assemble(RelativeJump.Zero, gotoB);
         assemble(this.rightOperand, gotoA, gotoB);
@@ -132,7 +132,7 @@ else if (this.leftOperand instanceof ComparisonExpression)
     }
     else if (this.rightOperand instanceof ComparisonExpression)
     {
-      if (this.operator.getOperator().equals("&&"))
+      if (this.operator.equals("&&"))
       {
         Label gotoC = LabelList.getCurrent().getNext();
         assemble(this.leftOperand, gotoC, gotoB);
@@ -149,7 +149,7 @@ else if (this.rightOperand instanceof ComparisonExpression)
     }
     else
     {
-      if (this.operator.getOperator().equals("&&"))
+      if (this.operator.equals("&&"))
       {
         Label gotoC = LabelList.getCurrent().getNext();
         assemble(this.leftOperand, gotoC, gotoB);

src/nsl/expression/ComparisonExpression.java

@@ -24,7 +24,7 @@ public class ComparisonExpression extends ConditionalExpression
    */
   public ComparisonExpression(Expression leftOperand, String operator, Expression rightOperand, ComparisonType comparisonType)
   {
-    super(leftOperand, new Operator(operator, OperatorType.Mathematical), rightOperand);
+    super(leftOperand, operator, rightOperand);
     this.comparisonType = comparisonType;
   }
 
@@ -142,27 +142,27 @@ public void assemble(Label gotoA, Label gotoB) throws IOException
       Register varRight = RegisterList.getCurrent().getNext();
       ((AssembleExpression)this.leftOperand).assemble(varLeft);
       ((AssembleExpression)this.rightOperand).assemble(varRight);
-      assembleCmp(varLeft.toString(), this.operator.getOperator(), varRight.toString(), gotoA, gotoB, this.comparisonType);
+      assembleCmp(varLeft.toString(), this.operator, varRight.toString(), gotoA, gotoB, this.comparisonType);
       varRight.setInUse(false);
       varLeft.setInUse(false);
     }
     else if (this.leftOperand instanceof AssembleExpression)
     {
       Register varLeft = RegisterList.getCurrent().getNext();
       ((AssembleExpression)this.leftOperand).assemble(varLeft);
-      assembleCmp(varLeft.toString(), this.operator.getOperator(), this.rightOperand.toString(), gotoA, gotoB, this.comparisonType);
+      assembleCmp(varLeft.toString(), this.operator, this.rightOperand.toString(), gotoA, gotoB, this.comparisonType);
       varLeft.setInUse(false);
     }
     else if (this.rightOperand instanceof AssembleExpression)
     {
       Register varRight = RegisterList.getCurrent().getNext();
       ((AssembleExpression)this.rightOperand).assemble(varRight);
-      assembleCmp(this.leftOperand.toString(), this.operator.getOperator(), varRight.toString(), gotoA, gotoB, this.comparisonType);
+      assembleCmp(this.leftOperand.toString(), this.operator, varRight.toString(), gotoA, gotoB, this.comparisonType);
       varRight.setInUse(false);
     }
     else
     {
-      assembleCmp(this.leftOperand.toString(), this.operator.getOperator(), this.rightOperand.toString(), gotoA, gotoB, this.comparisonType);
+      assembleCmp(this.leftOperand.toString(), this.operator, this.rightOperand.toString(), gotoA, gotoB, this.comparisonType);
     }
   }
 }

src/nsl/expression/ConcatenationExpression.java

@@ -28,7 +28,7 @@ protected ConcatenationExpression()
    */
   public ConcatenationExpression(Expression leftOperand, Expression rightOperand)
   {
-    super(leftOperand, new Operator(".", OperatorType.Mathematical), rightOperand);
+    super(leftOperand, ".", rightOperand);
 
     if (leftOperand.type.equals(ExpressionType.StringSpecial) || rightOperand.type.equals(ExpressionType.StringSpecial))
       this.type = ExpressionType.StringSpecial;

src/nsl/expression/ConditionalExpression.java

@@ -19,7 +19,7 @@ public abstract class ConditionalExpression extends LogicalExpression
    * @param operator the operator
    * @param rightOperand the right operand
    */
-  public ConditionalExpression(Expression leftOperand, Operator operator, Expression rightOperand)
+  public ConditionalExpression(Expression leftOperand, String operator, Expression rightOperand)
   {
     super(leftOperand, operator, rightOperand);
     this.type = ExpressionType.Boolean;

src/nsl/expression/Expression.java

@@ -406,29 +406,33 @@ else if (ExpressionType.isString(left) && ExpressionType.isString(right))
     }
     else if (ExpressionType.isBoolean(left))
     {
-      if (operator.equals("==") && left.booleanValue == false && right.type == ExpressionType.Boolean)
+      if (operator.equals("==") && right.type == ExpressionType.Boolean)
       {
-        right.booleanValue = !right.booleanValue;
-        return left;
+        if (left.booleanValue == false)
+          right.booleanValue = !right.booleanValue;
+        return right;
       }
-      if (operator.equals("!=") && left.booleanValue == true && right.type == ExpressionType.Boolean)
+      if (operator.equals("!=") && right.type == ExpressionType.Boolean)
       {
-        right.booleanValue = !right.booleanValue;
-        return left;
+        if (left.booleanValue == true)
+          right.booleanValue = !right.booleanValue;
+        return right;
       }
       comparisonType = ComparisonType.String;
     }
     else if (ExpressionType.isBoolean(right))
     {
-      if (operator.equals("==") && right.booleanValue == false && left.type == ExpressionType.Boolean)
+      if (operator.equals("==") && left.type == ExpressionType.Boolean)
       {
-        left.booleanValue = !left.booleanValue;
+        if (right.booleanValue == false)
+          left.booleanValue = !left.booleanValue;
         return left;
       }
-      if (operator.equals("!=") && right.booleanValue == true && left.type == ExpressionType.Boolean)
+      if (operator.equals("!=") && left.type == ExpressionType.Boolean)
       {
-        left.booleanValue = !left.booleanValue;
-        return right;
+        if (right.booleanValue == true)
+          left.booleanValue = !left.booleanValue;
+        return left;
       }
       comparisonType = ComparisonType.String;
     }