Changeset 2132

Timestamp:

06/29/08 06:06:23 (3 months ago)

Author:

sukyoungryu

Message:

[copyright] Fixed copyright notices.

Files:

• trunk/Library/incomplete/SkipTreeTest.fss (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/Shell.java (modified) (12 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/Fortress.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/repository/CacheBasedRepository.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/unicode/OperatorStuffGenerator.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/useful/ConvenientStrings.java (modified) (1 diff)

trunk/Library/incomplete/SkipTreeTest.fss

@@ +1 @@
+(*******************************************************************************
+    Copyright 2008 Sun Microsystems, Inc.,
+    4150 Network Circle, Santa Clara, California 95054, U.S.A.
+    All rights reserved.
+
+    U.S. Government Rights - Commercial software.
+    Government users are subject to the Sun Microsystems, Inc. standard
+    license agreement and applicable provisions of the FAR and its supplements.
+
+    Use is subject to license terms.
+
+    This distribution may include materials developed by third parties.
+
+    Sun, Sun Microsystems, the Sun logo and Java are trademarks or registered
+    trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
+ ******************************************************************************)
+
-component SkipTreeTest
-import SkipTree.{...}
@@ -8 +25 @@
-    println leaf.toString()
-    println leaf.find(3)
-    
+
-    testList = emptyList[\ZZ32\]().addRight(5).addRight(10).addRight(15).addRight(20)
-    assert(binarySearch[\ZZ32\](testList, 2), -1)
@@ -20 +37 @@
-    assert(binarySearch[\ZZ32\](testList, 23), -5)
-
-    
+
-    (** tree = SkipTree[\ZZ32,ZZ32\](Just[\Node[\ZZ32,ZZ32\]\](leaf)) *)
-
-
-
-
+
+
+
+
-end (* run(args:String...):() *)
-

trunk/ProjectFortress/src/com/sun/fortress/Shell.java

@@ -43 +43 @@
-
-public final class Shell {
-    // public static boolean debug;
-    static boolean test;
-    private static String COMPONENT_SUFFIX = ".fss";
-    private static String API_SUFFIX = ".fsi";
-
-    public static String fortressLocation() {
-        return ProjectProperties.ANALYZED_CACHE_DIR;
-    }
-
-    /* Helper method to print usage message.*/
-    private static void printUsageMessage() {
-        System.err.println("Usage:");
-
+ 
-        System.err.println(" [run] [-test] [-debug [#]] somefile.fss arg...");
-        System.err.println(" parse [-out file] [-debug [#]] somefile.fs{s,i}...");
@@ -65 +58 @@
-        System.err.println
-        ("Invoked as script: fortress args\n"+
-
+
+
+
+
+
+
+
-         "fortress [run] [-test] [-debug [#]] somefile.fss arg ...\n"+
-         "  Runs somefile.fss through the Fortress interpreter, passing arg ... to the\n"+
-         "  run method of somefile.fss.\n"+
+         "   -test : first runs test functions associated with the program.\n"+
-         "   -debug : enables debugging to the maximum level and prints java stack traces.\n"+
-         "   -debug # : sets debugging to the specified level, where # is a number.\n"+
-         "   -test : first runs test functions associated with the program.\n"+
-         "\n"+
-
-
+
+
+
+
-         "   -debug : enables debugging to the maximum level and prints java stack traces.\n"+
-         "   -debug # : sets debugging to the specified level, where # is a number.\n"+
-         "   -out file : dumps the processed abstract syntax tree to a file.\n" +
-         "\n"+
-         "fortress parse [-out file] [-debug [#]] somefile.fs{i,s}\n"+
-         "  Parses a file. If the parse succeeds the message \"Ok\" will be printed.\n"+
-         "  If -out file is given, a message about the file being written to will be printed.\n"+
-         "   -debug : enables debugging to the maximum level and prints java stack traces.\n"+
-         "   -debug # : sets debugging to the specified level, where # is a number.\n"+
-         "   -out file : dumps the abstract syntax tree to a file.\n"+
-         "\n"+
-         "fortress typecheck [-out file] [-debug [#]] somefile.fs{i,s}\n"+
-
+
+
-         "   -debug : enables debugging to the maximum level and prints java stack traces.\n"+
-
-
+
-        );
-    }
@@ -108 +101 @@
-        try {
-            String what = tokens[0];
-
-
-
-
+
+
+
+
+
+
+
-            } else if (what.equals("typecheck")) {
-                turnOnTypeChecking();
-
-
+
+
+
-                // no "run" command.
-                run(Arrays.asList(tokens));
-            } else if ( what.equals("parse" ) ){
-                parse(Arrays.asList(tokens).subList(1, tokens.length), Option.<String>none());
-            } else if (what.equals("help")) {
-                printHelpMessage();
@@ -134 +129 @@
-
-    /**
- If you want a dump then give
-
+
+If you want a dump then give 
-     */
-
+
+
+
+
+
-        String s = args.get(0);
-        List<String> rest = args.subList(1, args.size());
@@ -155 +154 @@
-                rest = rest.subList( 1, rest.size() );
-            }
-            if (s.equals("-test")) test = true;
-            if (s.equals("-noPreparse")) ProjectProperties.noPreparse = true;
-
@@ -166 +164 @@
-    private static void parse( String file, Option<String> out){
-        try{
-
-
-
-
+
+
+
-                try{
-                    ASTIO.writeJavaAst(unit, out.unwrap());
@@ -186 +183 @@
-    }
-
+    private static boolean isInteger( String s ){
+        try{
+            int i = Integer.valueOf(s);
+            return i == i;
+        } catch ( NumberFormatException n ){
+            return false;
+        }
+    }
+
-    private static boolean isApi(String file){
-API
+ProjectProperties.API_SOURCE
-    }
-
-    private static boolean isComponent(String file){
-
-
-
-
-
+
+
+
+
+
+
-            return NodeFactory.makeAPIName(file.substring( 0, file.lastIndexOf(".") ));
-        }
-        return NodeFactory.makeAPIName(file);
+    }
+
+    /**
+     * Compile a file.
+     * If you want a dump then give -out somefile.
+     */
+    static void compile(List<String> args, Option<String> out)
+        throws UserError, InterruptedException, IOException {
+        if (args.size() == 0) {
+            throw new UserError("Need a file to compile");
+        }
+        String s = args.get(0);
+        List<String> rest = args.subList(1, args.size());
+
+        if (s.startsWith("-")) {
+            if (s.equals("-debug")){
+                Debug.setDebug( 99 );
+                if ( ! rest.isEmpty() && isInteger( rest.get( 0 ) ) ){
+                    Debug.setDebug( Integer.valueOf( rest.get( 0 ) ) );
+                    rest = rest.subList( 1, rest.size() );
+                } else {
+                    ProjectProperties.debug = true;
+                }
+            }
+            if (s.equals("-out") && ! rest.isEmpty() ){
+                out = Option.<String>some(rest.get(0));
+                rest = rest.subList(1, rest.size());
+            }
+            if (s.equals("-noPreparse")) ProjectProperties.noPreparse = true;
+            compile(rest, out);
+        } else {
+            compile(s, out );
+        }
-    }
-
@@ -211 +251 @@
-     * @throws IOException
-     */
-
+
+
-        try {
-
-
+
-            Fortress fortress = new Fortress(repository);
-
-            Path path = ProjectProperties.SOURCE_PATH;
-
+            /* 1) Not for parse
+               2) What if there are multiple "/"s
+             */
-            if (s.contains("/")) {
-                String head = s.substring(0, s.lastIndexOf("/"));
@@ -231 +274 @@
-                    System.err.println(error);
-                }
+            // If there are no errors, all components will have been written to disk by the CacheBasedRepository.
-            } else if ( out.isSome() ){
-                try{
-                    if ( isApi(s) ){
-api
+cu
-                    } else if ( isComponent(s) ){
-api
+cu
-                    } else {
-                        System.out.println( "Don't know what kind of file " + s + " is. Append .fsi or .fss." );
-                    }
-                } catch ( FileNotFoundException e ){
-                    System.out.println( "Could not find file " + s );
-                } catch ( IOException e ){
-
-
-
-
-
-
+
+
+
+
-            System.err.println(error);
-        }
-    }
-
-
+
+
+
+
+
-        if (args.size() == 0) {
-compile
+run
-        }
-        String s = args.get(0);
@@ -270 +314 @@
-                }
-            }
-            if (s.equals("-out") && ! rest.isEmpty() ){
-                out = Option.wrap(rest.get(0));
-                rest = rest.subList(1, rest.size());
-            }
-            if (s.equals("-test")) test = true;
-            if (s.equals("-noPreparse")) ProjectProperties.noPreparse = true;
-            compile( doLink, rest, out);
-        } else {
-            compile( doLink, s, out );
-        }
-    }
-
-    private static boolean isInteger( String s ){
-        try{
-            int i = Integer.valueOf(s);
-            return i == i;
-        } catch ( NumberFormatException n ){
-            return false;
-        }
-    }
-
-    static void run(List<String> args) throws UserError, IOException, Throwable {
-        if (args.size() == 0) {
-            throw new UserError("Need a file to run");
-        }
-        String s = args.get(0);
-        List<String> rest = args.subList(1, args.size());
-
-        if (s.startsWith("-")) {
-            if (s.equals("-debug")){
-                Debug.setDebug( 99 );
-                if ( ! rest.isEmpty() && isInteger( rest.get( 0 ) ) ){
-                    Debug.setDebug( Integer.valueOf( rest.get( 0 ) ) );
-                    rest = rest.subList( 1, rest.size() );
-                } else {
-                    ProjectProperties.debug = true;
-                }
-            }
-            if (s.equals("-test")) test= true;
-            if (s.equals("-noPreparse")) ProjectProperties.noPreparse = true;
-            run(rest);
@@ -315 +321 @@
-        }
-    }
-
+
+
+
-        try {
-            //FortressRepository fileBasedRepository = new FileBasedRepository(shell.getPwd());
-            Fortress fortress = new Fortress(new CacheBasedRepository(ProjectProperties.ANALYZED_CACHE_DIR));
-
@@ -328 +335 @@
-            }
-
-
-
-
-
-
-
-
-
+
-
-            for (StaticError error: errors) {
-                System.err.println(error);
-            }
-Fil
+Cach
-        } catch ( StaticError e ){
-            System.err.println(e);

trunk/ProjectFortress/src/com/sun/fortress/compiler/Fortress.java

@@ -316 +316 @@
- }
-
-String
+APIName
-  FortressRepository bcr = Driver.specificRepository(path);
-
-                /*
-  if (! (_bcr instanceof BatchCachingAnalyzingRepository) ) {
-   throw new ProgramError("Please set property fortress.static.analysis=1.");
-  }
-                */
-
-  // BatchCachingAnalyzingRepository bcr = (BatchCachingAnalyzingRepository) _bcr;
-                /*
-  bcr.setVerbose(ProjectProperties.debug);
-  Parser.Result result = compileInner(bcr, componentName);
-  if (!result.isSuccessful()) { return result.errors(); }
-
-  if (bcr.verbose())
-   System.err.println("Parsing done.");
-                */
-
-  try {
-NodeFactory.makeAPIName(componentName)
+componentName
-   Driver.runProgram(bcr, cu, test, args);
-  } catch (Throwable th) {

trunk/ProjectFortress/src/com/sun/fortress/repository/CacheBasedRepository.java

@@ -108 +108 @@
-
-        try {
-
-
-
-
-
-
-
+
-        } catch (IOException e) {
-            throw new ShellException(e);
@@ -125 +119 @@
-        if (! actual.equals(name)) {
-            boolean flag = actual.equals(name);
-st.getName()
+ctual
-        }
-    }
@@ -143 +137 @@
-
-        try {
-
-
+
-        } catch (IOException e) {
-            throw new ShellException(e);

trunk/ProjectFortress/src/com/sun/fortress/unicode/OperatorStuffGenerator.java

@@ -1 +1 @@
-/*******************************************************************************
-7
+8
-    4150 Network Circle, Santa Clara, California 95054, U.S.A.
-    All rights reserved.

trunk/ProjectFortress/src/com/sun/fortress/useful/ConvenientStrings.java

@@ -1 +1 @@
-/*******************************************************************************
-7
+8
-    4150 Network Circle, Santa Clara, California 95054, U.S.A.
-    All rights reserved.