Changeset 3386 for devel-tools/trunk

Timestamp:

Feb 7, 2008, 3:17:24 PM (13 years ago)

Author:

yura

Message:

• "May be null!" JavaDoc?.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp

Files:

• ast/AstAlt.java (modified) (1 diff)
• ast/AstCall.java (modified) (1 diff)
• ast/AstConstBinding.java (modified) (1 diff)
• ast/AstCut.java (modified) (1 diff)
• ast/AstDecl.java (modified) (2 diffs)
• ast/AstError.java (modified) (1 diff)
• ast/AstFence.java (modified) (1 diff)
• ast/AstFormat.java (modified) (1 diff)
• ast/AstFuncDecl.java (modified) (2 diffs)
• ast/AstFuncDef.java (modified) (1 diff)
• ast/AstImplem.java (modified) (1 diff)
• ast/AstInterf.java (modified) (2 diffs)
• ast/AstIter.java (modified) (1 diff)
• ast/AstName.java (modified) (1 diff)
• ast/AstNative.java (modified) (1 diff)
• ast/AstNode.java (modified) (1 diff)
• ast/AstNot.java (modified) (1 diff)
• ast/AstNumberSymbol.java (modified) (1 diff)
• ast/AstObjDecl.java (modified) (1 diff)
• ast/AstParen.java (modified) (1 diff)
• ast/AstPattern.java (modified) (1 diff)
• ast/AstRef.java (modified) (1 diff)
• ast/AstResult.java (modified) (1 diff)
• ast/AstTrap.java (modified) (1 diff)
• ast/AstUse.java (modified) (1 diff)
• ast/AstVar.java (modified) (1 diff)
• ast/AstWordSymbol.java (modified) (1 diff)
• parse/RfpParser.java (modified) (7 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstAlt.java

@@ -17 +17 @@
     public AstAlt (SrcPosition pos, FailMode failMode, AstSentence[] sentenceList) {
         super(pos);
+        assert failMode != null && sentenceList != null;
         this.failMode = failMode;
         this.sentenceList = sentenceList;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstCall.java

@@ -4 +4 @@
 
 public final class AstCall extends AstTerm implements IHoverInfo {
+    /** May be <code>null</code>! */
     public final AstName name;
     public final AstExp arg;
+    /** May be <code>null</code>! */
     public AstFuncDecl funcDecl = null;
 
     public AstCall (SrcPosition pos, AstName name, AstExp arg) {
         super(pos);
+        assert arg != null;
         this.name = name;
         this.arg = arg;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstConstBinding.java

@@ -8 +8 @@
     public AstConstBinding (SrcPosition pos, AstName name, boolean isPublic, AstExp exp) {
         super(pos, name, isPublic);
+        assert exp != null;
         this.exp = exp;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstCut.java

@@ -4 +4 @@
 
 public final class AstCut extends AstStatement {
+    /** May be <code>null</code>! */
     public AstFence fence = null;
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstDecl.java

@@ -6 +6 @@
 
 public abstract class AstDecl extends AstTopNode implements IHoverInfo {
+    /** May be <code>null</code>! */
     public final AstName name;
     public final boolean isPublic;
-    public String module;
+    /** May be <code>null</code>! */
+    public String module = null;
+    /** May be <code>null</code>! */
     public ArrayList<AstName> uses = null;
 
@@ -18 +21 @@
 
     public String getQualifiedName () {
-        if (name == null)
+        if (name == null || module == null)
             return null;
-        return (module != null ? module + "." : "") + name.identifier;
+        return module + "." + name.identifier;
     }
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstError.java

@@ -8 +8 @@
     public AstError (SrcPosition pos, AstSentence sentence) {
         super(pos);
+        assert sentence != null;
         this.sentence = sentence;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstFence.java

@@ -6 +6 @@
 
 public final class AstFence extends AstStatement {
+    /** May be <code>null</code>! */
     public ArrayList<AstNode> uses = null;
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstFormat.java

@@ -8 +8 @@
     public AstFormat (SrcPosition pos, AstExp exp) {
         super(pos);
+        assert exp != null;
         this.exp = exp;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstFuncDecl.java

@@ -15 +15 @@
     public final AstExp inFormat;
     public final AstExp outFormat;
+    /** May be <code>null</code>! */
     public AstTopNode funcDef = null;
 
@@ -20 +21 @@
             AstExp outFormat) {
         super(pos, name, isPublic);
+        assert retMode != null && inFormat != null && outFormat != null;
         this.retMode = retMode;
         this.inFormat = inFormat;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstFuncDef.java

@@ -3 +3 @@
 import org.refal.plus.rfpdt.comp.SrcPosition;
 
-public final class AstFuncDef extends AstTopNode implements IHoverInfo  {
+public final class AstFuncDef extends AstTopNode implements IHoverInfo {
     public final AstName name;
     public final AstSentence body;
+    /** May be <code>null</code>! */
     public AstFuncDecl funcDecl = null;
 
     public AstFuncDef (SrcPosition pos, AstName name, AstSentence body) {
         super(pos);
+        assert name != null && body != null;
         this.name = name;
         this.body = body;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstImplem.java

@@ -4 +4 @@
 
 public final class AstImplem extends AstNode {
+    /** May be <code>null</code>! */
     public final AstName astModuleName;
     public final AstUse[] useList;
     public final AstTopNode[] topNodeList;
-    public String moduleName;
+    /** May be <code>null</code>! */
+    public String moduleName = null;
 
     public AstImplem (SrcPosition pos, AstName moduleName, AstUse[] useList, AstTopNode[] topNodeList) {
         super(pos);
+        assert useList != null && topNodeList != null;
         this.astModuleName = moduleName;
         this.useList = useList;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstInterf.java

@@ -4 +4 @@
 
 public final class AstInterf extends AstNode {
+    /** May be <code>null</code>! */
     public final AstName moduleName;
     public final AstTopNode[] topNodeList;
@@ -9 +10 @@
     public AstInterf (SrcPosition pos, AstName moduleName, AstTopNode[] topNodeList) {
         super(pos);
+        assert topNodeList != null;
         this.moduleName = moduleName;
         this.topNodeList = topNodeList;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstIter.java

@@ -9 +9 @@
     public AstIter (SrcPosition pos, AstSentence sentence, AstExp target) {
         super(pos);
+        assert sentence != null && target != null;
         this.sentence = sentence;
         this.target = target;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstName.java

@@ -8 +8 @@
     public AstName (SrcPosition pos, String identifier) {
         super(pos);
+        assert identifier != null;
         this.identifier = identifier;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstNative.java

@@ -5 +5 @@
 public final class AstNative extends AstTopNode {
     public final AstName left;
+    /** May be <code>null</code>! */
     public final AstName right;
     public boolean isNameAtLeft = true;
+    /** May be <code>null</code>! */
     public AstFuncDecl funcDecl = null;
 
     public AstNative (SrcPosition pos, AstName left, AstName right) {
         super(pos);
+        assert left != null;
         this.left = left;
         this.right = right;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstNode.java

@@ -5 +5 @@
 public abstract class AstNode {
     public final SrcPosition pos;
-    
+
     protected AstNode (SrcPosition pos) {
-        assert pos!=null;
+        assert pos != null;
         this.pos = pos;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstNot.java

@@ -8 +8 @@
     public AstNot (SrcPosition pos, AstSentence sentence) {
         super(pos);
+        assert sentence != null;
         this.sentence = sentence;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstNumberSymbol.java

@@ -10 +10 @@
     public AstNumberSymbol (SrcPosition pos, BigInteger bigInteger) {
         super(pos);
+        assert bigInteger != null;
         this.bigInteger = bigInteger;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstObjDecl.java

@@ -12 +12 @@
     public AstObjDecl (SrcPosition pos, ObjKind kind, AstName name, boolean isPublic) {
         super(pos, name, isPublic);
+        assert kind != null;
         this.kind = kind;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstParen.java

@@ -8 +8 @@
     public AstParen (SrcPosition pos, AstExp exp) {
         super(pos);
+        assert exp != null;
         this.exp = exp;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstPattern.java

@@ -17 +17 @@
     public AstPattern (SrcPosition pos, MatchDir dir, AstExp exp) {
         super(pos);
+        assert dir != null && exp != null;
         this.dir = dir;
         this.exp = exp;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstRef.java

@@ -4 +4 @@
 
 public final class AstRef extends AstTerm implements IHoverInfo {
+    /** May be <code>null</code>! */
     public final AstName name;
+    /** May be <code>null</code>! */
     public AstDecl decl = null;
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstResult.java

@@ -8 +8 @@
     public AstResult (SrcPosition pos, AstExp exp) {
         super(pos);
+        assert exp != null;
         this.exp = exp;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstTrap.java

@@ -7 +7 @@
     public final AstSentence catchSentence;
 
-    public AstTrap (SrcPosition pos, AstSentence sentence, AstSentence catchSentance) {
+    public AstTrap (SrcPosition pos, AstSentence trySentence, AstSentence catchSentance) {
         super(pos);
-        this.trySentence = sentence;
+        assert trySentence != null && catchSentance != null;
+        this.trySentence = trySentence;
         this.catchSentence = catchSentance;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstUse.java

@@ -5 +5 @@
 public final class AstUse extends AstNode {
     public final AstName name;
+    /** May be <code>null</code>! */
     public AstInterf interf = null;
 
     public AstUse (SrcPosition pos, AstName name) {
         super(pos);
+        assert name != null;
         this.name = name;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstVar.java

@@ -26 +26 @@
 
     public final VarType type;
+    /** May be <code>null</code>! */
     public final AstName name;
+    /** May be <code>null</code>! */
     public AstVar varDefinition = null;
+    /** May be <code>null</code>! */
     public ArrayList<AstVar> varUses = null;
 
     public AstVar (SrcPosition pos, VarType type, AstName name) {
         super(pos);
+        assert type != null;
         this.type = type;
         this.name = name;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstWordSymbol.java

@@ -8 +8 @@
     public AstWordSymbol (SrcPosition pos, String word) {
         super(pos);
+        assert word != null;
         this.word = word;
     }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/parse/RfpParser.java

@@ -118 +118 @@
 
 public final class RfpParser {
+    /** May return <code>null</code>! */
     public static AstInterf parseInterf (String moduleName, Reader reader, MsgHandler msgHandler) {
         RfpResource rfpResource = RfpResource.interf(moduleName);
@@ -130 +131 @@
     }
 
+    /** May return <code>null</code>! */
     public static AstImplem parseImplem (String moduleName, Reader reader, MsgHandler msgHandler) {
         RfpResource rfpResource = RfpResource.implem(moduleName);
@@ -235 +237 @@
     // MODULE name SC
 
+    /** May return <code>null</code>! */
     private AstName module_name (long ftk) {
         if (!acceptWOError(MODULE, ftk))
@@ -412 +415 @@
         accept(EQL, s_exp | ftk);
         AstExp outFormat = exp(ftk);
-        list.add(new AstFuncDecl(SrcPosition.fromToInclusive(start, outFormat.pos), astName, isPublic, retMode, inFormat, outFormat));
+        list.add(new AstFuncDecl(SrcPosition.fromToInclusive(start, outFormat.pos), astName, isPublic, retMode,
+                inFormat, outFormat));
     }
 
@@ -865 +869 @@
             astTerm = new AstCall(pos, astName, astExp);
         } else {
-            assert true;
+            assert false;
             astTerm = null;
         }
@@ -889 +893 @@
             astSymbol = new AstNumberSymbol(tkPos, scanner.tkBigInteger);
         else {
-            assert true;
+            assert false;
             astSymbol = null;
         }
@@ -913 +917 @@
     // WORD
 
-    /**
-     * May return <code>null</code>!
-     */
-
+    /** May return <code>null</code>! */
     private AstName name (long ftk, MsgCode msgCode) {
         if (sync(WORD, ftk)) {