From: JT <jeremiah.turner@gmail.com>
Date: Tue, 21 Apr 2015 20:09:01 +0000 (-0400)
Subject: Small changes to coding style and to ca65 documentation for .ADDRSIZE
X-Git-Tag: V2.15~11^2~1^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ffa52863b3ad83fbf27b63b829a2196d4acac095;p=cc65

Small changes to coding style and to ca65 documentation for .ADDRSIZE
---

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 9f802af40..e3057915d 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -1278,26 +1278,28 @@ writable.
 Pseudo functions expect their arguments in parenthesis, and they have a result,
 either a string or an expression.
 
+
 <sect1><tt>.ADDRSIZE</tt><label id=".ADDRSIZE"><p>
 
   The <tt/.ADDRSIZE/ function is used to return the interal address size 
   associated with a symbol. This can be helpful in macros when knowing the address 
-  size of symbol can allow for custom instructions.
+  size of symbol can help with custom instructions.
 
   Example:
 
   <tscreen><verb>
         .macro myLDA foo
-  	        .if .ADDRSIZE(foo) = 1
-  	          	        ;do custom command based on zeropage addressing:
-  	          	        .byte .A5h, foo
-  	        .elseif .ADDRSIZE(foo) = 2
-  	          	        ;do custom command based on absolute addressing:
-  	          	        .byte .ADh, foo
-  	        .elseif .ADDRSIZE(foo) = 0
-  	          	        ; no address size define for this symbol:
-  	          	        .out .sprinft("Error, address size unknown for symbol %s", .string(foo))
-  	        .endif
+                .if .ADDRSIZE(foo) = 1
+                        ;do custom command based on zeropage addressing:
+                        .byte 0A5h, foo
+                .elseif .ADDRSIZE(foo) = 2
+                        ;do custom command based on absolute addressing:
+                        .byte 0ADh
+                        .word foo
+                .elseif .ADDRSIZE(foo) = 0
+                        ; no address size define for this symbol:
+                        .out .sprintf("Error, address size unknown for symbol %s", .string(foo))
+                .endif
         .endmacro
   </verb></tscreen>
 
@@ -1306,7 +1308,6 @@ either a string or an expression.
   See: <tt><ref id=".FEATURE" name=".FEATURE"></tt>
 
 
-
 <sect1><tt>.BANK</tt><label id=".BANK"><p>
 
   The <tt/.BANK/ function is used to support systems with banked memory. The
@@ -2682,6 +2683,11 @@ Here's a list of all control commands and a description, what they do:
     overridden. When using this feature, you may also get into trouble if
     later versions of the assembler define new keywords starting with a dot.
 
+  <tag><tt>loose_char_term</tt><label id="loose_char_term"></tag>
+
+    Accept single quotes as well as double quotes as terminators for char
+    constants.
+
   <tag><tt>loose_string_term</tt><label id="loose_string_term"></tag>
 
     Accept single quotes as well as double quotes as terminators for string
diff --git a/src/ca65/expr.c b/src/ca65/expr.c
index 8fdc37421..8b87d0860 100644
--- a/src/ca65/expr.c
+++ b/src/ca65/expr.c
@@ -688,15 +688,13 @@ static ExprNode* FuncAddrSize (void)
         if (Sym) {
             AddrSize = Sym->AddrSize;
         } else {
-            Error ("Unknown symbol or scope: `%m%p%m%p'",
-                &ScopeName, &Name);
+            Error ("Unknown symbol or scope: `%m%p%m%p'", &ScopeName, &Name);
         }
 
     }
 
     if (AddrSize == 0) {
-        Warning(1, "Unknown address size: `%m%p%m%p'",
-            &ScopeName, &Name);
+        Warning (1, "Unknown address size: `%m%p%m%p'", &ScopeName, &Name);
     }
 
     /* Free the string buffers */