Merge pull request #1 from Movax12/addrsize

Improved on funciton .ADDRSIZE. Conform to coding style.

src/ca65/expr.c

@@ -649,8 +649,7 @@ static ExprNode* FuncAddrSize(void)
         Sym = SymFindLocal (SymLast, &CurTok.SVal, SYM_FIND_EXISTING);
         if (Sym == 0) {
             Error ("Unknown symbol or scope: `%m%p'", &CurTok.SVal);
-        }
-        else {
+        } else {
             AddrSize = Sym->AddrSize;
         }
 
@@ -659,8 +658,7 @@ static ExprNode* FuncAddrSize(void)
         NextTok ();
         SB_Terminate (&ScopeName);
 
-    }
-    else {
+    } else {
 
         /* Parse the scope and the name */
         SymTable* ParentScope = ParseScopedIdent (&Name, &ScopeName);
@@ -674,42 +672,39 @@ static ExprNode* FuncAddrSize(void)
         }
 
         /* If ScopeName is empty, no explicit scope was specified. We have to
-        * search upper scope levels in this case.
+        ** search upper scope levels in this case.
         */
         NoScope = SB_IsEmpty (&ScopeName);
 
         /* If we did find a scope with the name, read the symbol defining the
-        * size, otherwise search for a symbol entry with the name and scope.
+        ** size, otherwise search for a symbol entry with the name and scope.
         */
         if (NoScope) {
             Sym = SymFindAny (ParentScope, &Name);
-        }
-        else {
+        } else {
             Sym = SymFind (ParentScope, &Name, SYM_FIND_EXISTING);
         }
         /* If we found the symbol retrieve the size, otherwise complain */
         if (Sym) {
             AddrSize = Sym->AddrSize;
-        }
-        else {
+        } else {
             Error ("Unknown symbol or scope: `%m%p%m%p'",
                 &ScopeName, &Name);
         }
 
     }
 
-    /* Check if we have a size */
-    /* if we don't know, return it anyway, zero can mean unknown, or uncomment this code for an error
     if (AddrSize == 0) {
-    Error ("Address size of `%m%p%m%p' is unknown", &ScopeName, &Name);
+        Warning(1, "Unknown address size: `%m%p%m%p'",
+            &ScopeName, &Name);
     }
-    */
 
     /* Free the string buffers */
     SB_Done (&ScopeName);
     SB_Done (&Name);
 
-    /* Return the size */
+    /* Return the size. */
+
     return GenLiteralExpr (AddrSize);
 }
 

src/ca65/scanner.c

@@ -739,9 +739,10 @@ static token_t FindDotKeyword (void)
             default:
                 break;
         }
+
         return R->Tok;
-    }
-    else {
+
+    } else {
         return TOK_NONE;
     }
 }