Changeset 348

Timestamp:

09/14/08 04:36:29 (4 months ago)

Author:

sergey.kol..@gmail.com

Message:

Sergey Kolos:

• Fixed bug: when compiling on save of a one changed expression all compile markers in the file are removed.
  

Files:

• jasko.tim.lisp/src/jasko/tim/lisp/builder/LispBuilder.java (modified) (6 diffs)
• jasko.tim.lisp/src/jasko/tim/lisp/builder/LispMarkers.java (modified) (1 diff)
• jasko.tim.lisp/src/jasko/tim/lisp/editors/LispEditor.java (modified) (5 diffs)

jasko.tim.lisp/src/jasko/tim/lisp/builder/LispBuilder.java

@@ -179 +179 @@
-                                SwankInterface swank = LispPlugin.getDefault().getSwank();
-                                swank.sendCompileFile(file.getLocation().toString(), 
-
+,true
-                                System.out.printf("Compiling %s\n", file.getLocation().toString());
-                        } catch (Exception e) {
@@ -218 +218 @@
-                boolean compiledByAsd = false;
-                String asdFile = "";
+                boolean removeCompileMarkers = true;
-                
-
+, boolean removeCompileMarkers
-                        this.file = file;
-                        offset = 0;
@@ -225 +226 @@
-                        compiledByAsd = false;
-                        asdFile = "";
+                        this.removeCompileMarkers = removeCompileMarkers;
-                }
-                
@@ -242 +244 @@
-                public void run() {
-                        ArrayList<String> files = new ArrayList<String>();
-
+ && removeCompileMarkers 
-                                LispMarkers.deleteCompileMarkers(file);
-                        } else if ( file != null && length > 0) {
@@ -319 +321 @@
-                                        }
-                                        if( nwarnings > 0 ){
-nr
+rn
-                                        }
-                                        repl.appendText(torepl);
@@ -581 +583 @@
-        }
-
+        public static boolean checkLisp(IFile resource, int offset, int length) {
+                if( !(resource.getName().endsWith(".lisp") || resource.getName().endsWith(".el")
+                                                || resource.getName().endsWith(".cl"))) {
+                        return false;
+                } else {
+                        
+                        try {
+                                IFile file = (IFile) resource;
+                                LispMarkers.deleteCompileMarkers(file, offset, length);                                                         
+                                System.out.println("*builder*");
+                                boolean paren = checkParenBalancing(file);
+                                LispNode code = LispParser.parse(file);
+                                boolean pack = checkPackageDependence(code,file);
+                                boolean commas = checkCommas(code,file);
+                                checkMultipleDefuncs(code,file);
+                                return (paren && pack && commas);
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                                return false;
+                        }
+                }
+        }
-        
-        public static boolean checkLisp(IFile resource) {

jasko.tim.lisp/src/jasko/tim/lisp/builder/LispMarkers.java

@@ -75 +75 @@
-                                }
-                        }
-                        markers = file.findMarkers(LISP_COMPILE_MARKER, true, IResource.DEPTH_ZERO);
-                } catch (CoreException e1) {
-                        e1.printStackTrace();

jasko.tim.lisp/src/jasko/tim/lisp/editors/LispEditor.java

@@ -406 +406 @@
-        private void compileOnSave() {
-                IDocument doc = getDocument();
-LispBuilder.checkLisp(getIFile()) 
+true /*LispBuilder.checkLisp(getIFile()) */
-                        SwankInterface swank = LispPlugin.getDefault().getSwank(); 
-                        ArrayList<TopLevelItem> newForms = 
@@ -424 +424 @@
-                        }
-                        if( pos == null || pos.length == 0 ){ //compile whole file
-
+
+
+
-                        } else { 
-                                compileForms(getFormsToCompile(pos, newForms, toDefine));
@@ -462 +464 @@
-                                        try{
-                                                sexp = doc.get(offset,n-offset);
-
+
+
+
-                                                doc.removePositionCategory(CHANGED_POS_FOR_COMPILE);
-                                                doc.addPositionCategory(CHANGED_POS_FOR_COMPILE);
@@ -470 +474 @@
-                                        break;
-                                } else if ( sexp != null && sexp != "" ){
-
+
+
+
-                                }
-                        }
@@ -648 +654 @@
-                for( String itm: toUndefine){
-                        String[] item = itm.split(",");
-
+,false
-                        if( item[0].equalsIgnoreCase("defun") ){
-                                LispPlugin.getDefault().getSwank().sendUndefine(item[1], item[2], cl);