[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-CVS ] plugins/RubyPlugin/src/org/jedit/ruby/ast ClassMember.java,1.4,1.5 Member.java,1.8,1.9
From: Robert McKinnon <robmckinnon () users ! sourceforge ! net>
Date: 2005-10-29 19:07:20
Message-ID: E1EVw34-00052d-2G () mail ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22196/org/jedit/ruby/ast
Modified Files:
ClassMember.java Member.java Method.java Module.java
ParentMember.java Problem.java Root.java RubyMembers.java
Warning.java
Log Message:
changed code to use new jruby parser; fixed various parsing problems
Index: Method.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Method.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Method.java 12 Oct 2005 07:31:06 -0000 1.9
+++ Method.java 29 Oct 2005 19:07:18 -0000 1.10
@@ -40,8 +40,8 @@
private boolean isClassMethod;
private boolean hasParameters;
- public Method(String name, String params, String filePath, String fileName, int \
startOuterOffset, int startOffset, boolean classMethod) {
- super(params == null ? name : name + params, startOuterOffset, startOffset);
+ public Method(String name, String params, String filePath, String fileName, \
boolean classMethod) { + super(params == null ? name : name + params);
this.filePath = filePath;
this.fileName = fileName;
isClassMethod = classMethod;
@@ -291,7 +291,7 @@
removeType("Fixnum", "0.0", result, types);
}
- private void removeType(String parentMemberName, String match, Result result, \
Set<Member> types) { + private static void removeType(String parentMemberName, \
String match, Result result, Set<Member> types) { if (result.has(match)) {
types.remove(getParentMember(parentMemberName));
}
@@ -309,7 +309,7 @@
}
}
- private void addType(String parentMemberName, Set<Member> types) {
+ private static void addType(String parentMemberName, Set<Member> types) {
types.add(getParentMember(parentMemberName));
}
Index: RubyMembers.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/RubyMembers.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RubyMembers.java 12 Oct 2005 07:31:06 -0000 1.4
+++ RubyMembers.java 29 Oct 2005 19:07:18 -0000 1.5
@@ -86,8 +86,16 @@
public final Member getPreviousMember(int caretPosition) {
int index = getCurrentMemberIndex(caretPosition);
+ Member currentMember = memberList.get(index);
if (index > 0) {
- return memberList.get(index - 1);
+ Member member = memberList.get(index - 1);
+ if (member.getEndOffset() < currentMember.getEndOffset() || \
caretPosition == currentMember.getStartOffset()) { + return member;
+ } else {
+ return currentMember;
+ }
+ } else if(currentMember.getStartOffset() < caretPosition) {
+ return currentMember;
} else {
return null;
}
@@ -116,12 +124,12 @@
for (int i = 0; memberIndex == -1 && i < memberList.size(); i++) {
Member member = memberList.get(i);
- int offset = member.getStartOuterOffset();
+ int start = member.getStartOffset();
- if (caretPosition >= offset) {
+ if (caretPosition >= start) {
if (i < memberList.size() - 1) {
Member nextMember = memberList.get(i + 1);
- int nextOffset = nextMember.getStartOuterOffset();
+ int nextOffset = nextMember.getStartOffset();
if (caretPosition < nextOffset) {
memberIndex = i;
}
Index: Member.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Member.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Member.java 12 Oct 2005 07:31:06 -0000 1.8
+++ Member.java 29 Oct 2005 19:07:18 -0000 1.9
@@ -38,26 +38,32 @@
private List<Member> childMembers;
private String namespace;
+ private String compositeNamespace;
private String name;
private final String shortName;
private String documentation;
- private final int startOuterOffset;
- private final int startOffset;
+ private int startOuterOffset;
+ private int startOffset;
private int endOffset;
- public Member(String name, int startOuterOffset, int startOffset) {
+ public Member(String name) {
parentCount = -1;
- this.startOffset = startOffset;
- this.startOuterOffset = startOuterOffset;
- setEndOffset(startOffset);
setName(name);
- shortName = (new StringTokenizer(name, " (")).nextToken();
+ shortName = name.indexOf("(") != -1 ? (new StringTokenizer(name, " \
(")).nextToken() : name; }
public int compareTo(Member member) {
return getFullName().compareTo(member.getFullName());
}
+ public final void setStartOuterOffset(int outerOffset) {
+ startOuterOffset = outerOffset;
+ }
+
+ public final void setStartOffset(int startOffset) {
+ this.startOffset = startOffset;
+ }
+
public final void setEndOffset(int endOffset) {
this.endOffset = endOffset;
}
@@ -76,6 +82,10 @@
return namespace;
}
+ public final void setCompositeNamespace(String namespace) {
+ compositeNamespace = namespace;
+ }
+
public final void setNamespace(String namespace) {
this.namespace = namespace;
}
@@ -93,6 +103,20 @@
}
/**
+ * Returns composite name for members
+ * that have been defined in code
+ * in the form
+ * module Www::Xxx or class Yyy::Zzz.
+ */
+ public String getCompositeName() {
+ if (compositeNamespace == null) {
+ return name;
+ } else {
+ return compositeNamespace + name;
+ }
+ }
+
+ /**
* Returns member name excluding
* any namespace or receiver prefix.
*/
Index: ClassMember.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/ClassMember.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ClassMember.java 12 Oct 2005 07:31:06 -0000 1.4
+++ ClassMember.java 29 Oct 2005 19:07:18 -0000 1.5
@@ -28,8 +28,8 @@
private String fullDocumentation;
- public ClassMember(String name, int startOuterOffset, int startOffset) {
- super(name, startOuterOffset, startOffset);
+ public ClassMember(String name) {
+ super(name);
}
public final void accept(MemberVisitor visitor) {
Index: Module.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Module.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Module.java 12 Oct 2005 07:31:06 -0000 1.3
+++ Module.java 29 Oct 2005 19:07:18 -0000 1.4
@@ -23,8 +23,9 @@
* @author robmckinnon at users.sourceforge.net
*/
public final class Module extends ParentMember {
- public Module(String name, int startOuterOffset, int startOffset) {
- super(name, startOuterOffset, startOffset);
+
+ public Module(String name) {
+ super(name);
}
public final void accept(MemberVisitor visitor) {
Index: ParentMember.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/ParentMember.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ParentMember.java 12 Oct 2005 07:31:06 -0000 1.5
+++ ParentMember.java 29 Oct 2005 19:07:18 -0000 1.6
@@ -27,8 +27,8 @@
*/
public abstract class ParentMember extends Member {
- protected ParentMember(String name, int startOuterOffset, int startOffset) {
- super(name, startOuterOffset, startOffset);
+ protected ParentMember(String name) {
+ super(name);
}
public final Set<Method> getMethods() {
Index: Warning.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Warning.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Warning.java 12 Oct 2005 07:31:06 -0000 1.2
+++ Warning.java 29 Oct 2005 19:07:18 -0000 1.3
@@ -23,6 +23,7 @@
* @author robmckinnon at users.sourceforge.net
*/
public final class Warning extends Problem {
+
/**
* @param message warning message
* @param line line number starting at 0
Index: Root.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Root.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Root.java 12 Oct 2005 07:31:06 -0000 1.3
+++ Root.java 29 Oct 2005 19:07:18 -0000 1.4
@@ -25,7 +25,7 @@
public final class Root extends Member {
public Root(int endOffset) {
- super("root", 0, 0);
+ super("root");
setEndOffset(endOffset);
}
Index: Problem.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ast/Problem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Problem.java 12 Oct 2005 07:31:06 -0000 1.3
+++ Problem.java 29 Oct 2005 19:07:18 -0000 1.4
@@ -25,6 +25,7 @@
* @author robmckinnon at users.sourceforge.net
*/
public abstract class Problem extends Member {
+
private final int line;
/**
@@ -32,7 +33,7 @@
* @param line line number starting at 0
*/
Problem(String message, int line) {
- super(message, 0, 0);
+ super(message);
this.line = line;
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic