Ignore:
Timestamp:
Mar 20, 2013, 1:15:54 PM (6 years ago)
Author:
ksherdy
Message:

Restructed PabloJ compile to provide clear separation between PabloS and PabloB.

Location:
proto/pabloj/trunk/src
Files:
80 added
16 deleted
4 edited
14 copied
6 moved

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/src/applicationGenerator/ApplicationGenerator.java

    r2940 r2952  
    2222import java.io.File;
    2323import applicationGenerator.helpers.FileUtil;
    24 import compiler.codeGenerator.visitors.CPPUnparser;
     24import applicationGenerator.parser.Parser;
     25import applicationGenerator.parser.ParserException;
    2526
    26 import compiler.codeGenerator.visitors.Unparser;
    27 import compiler.lang.pabloS.*;
    28 import compiler.lang.carry.*;
    29 import compiler.parser.*;
    30 import compiler.transformers.PabloS2PabloBXFormer;
    31 import compiler.transformers.pabloS.CarryInfoSetVisitor;
    32 import compiler.transformers.pabloS.PabloSTransformer;
    33 import compiler.symbolTable.*;
     27import compilers.pabloB.codeGenerator.visitors.CPPUnparser;
     28import compilers.pabloB.codeGenerator.visitors.Unparser;
     29import compilers.pabloB.lang.carry.CarryBuiltins2CPP;
     30import compilers.pabloB.lang.carry.CarryBuiltins2Lang;
     31import compilers.pabloB.symbols.SymbolTable;
     32import compilers.pabloS.lang.*;
     33import compilers.pabloS.semanticAnalyzer.visitors.CarryInfoSetVisitor;
     34import compilers.pabloS.semanticAnalyzer.visitors.PabloS2PabloBXFormer;
     35import compilers.pabloS.semanticAnalyzer.visitors.PabloSTransformer;
    3436
    3537public class ApplicationGenerator {
     
    5355                // Transformation configurations to support multiple backends
    5456                Builtins2Lang builtins2Lang             = null;
    55                 CarryBuiltins2Lang carrySet2Lang = null;
     57                CarryBuiltins2Lang carrySet2Lang        = null;
    5658                Unparser unparser                                       = null;
    5759               
  • proto/pabloj/trunk/src/applicationGenerator/HeaderTemplateContentsGenerator.java

    r2947 r2952  
    1111
    1212import applicationGenerator.helpers.FileUtil;
    13 import compiler.ast.pabloB.Accessors;
    14 import compiler.codeGenerator.visitors.Unparser;
    15 import compiler.templating.FileTemplate;
    16 import compiler.templating.Template;
     13import applicationGenerator.templating.FileTemplate;
     14import applicationGenerator.templating.Template;
     15import compilers.pabloB.ast.Accessors;
     16import compilers.pabloB.codeGenerator.visitors.Unparser;
    1717
    1818import java.io.File;
  • proto/pabloj/trunk/src/applicationGenerator/TemplateContentsGenerator.java

    r2935 r2952  
    77package applicationGenerator;
    88
    9 import compiler.codeGenerator.visitors.Unparser;
     9import compilers.pabloB.codeGenerator.visitors.Unparser;
    1010
    1111abstract public class TemplateContentsGenerator {
  • proto/pabloj/trunk/src/applicationGenerator/logging/Logger.java

    r2949 r2952  
    1 package compiler.logging;
     1package applicationGenerator.logging;
    22
    33import java.util.HashMap;
    44import java.util.Map;
    55import java.util.logging.Level;
    6 import java.util.logging.Logger;
    76
    87/** This class is a Facade for java.util.logging.
     
    1413 */
    1514
    16 public class PabloJLogger {
    17         private static Map<String, PabloJLogger> JuncoLoggers = new HashMap<String, PabloJLogger>();
     15public class Logger {
     16        private static Map<String, Logger> JuncoLoggers = new HashMap<String, Logger>();
    1817        private static int numMessages = 0;
    1918        private static int maxMessagesBeforeQuit = Integer.MAX_VALUE;
     
    2120        ////////////////////////////////////////////////////////////////
    2221        // static interface
    23         public static PabloJLogger getLogger(String loggerName) {
     22        public static Logger getLogger(String loggerName) {
    2423                if(!JuncoLoggers.containsKey(loggerName)) {
    25                         JuncoLoggers.put(loggerName, new PabloJLogger(loggerName));
     24                        JuncoLoggers.put(loggerName, new Logger(loggerName));
    2625                }
    2726                return JuncoLoggers.get(loggerName);
     
    3736        // per-instance code
    3837        private Logger logger;
    39         private PabloJLogger(String loggerName) {
     38        private Logger(String loggerName) {
    4039                logger = Logger.getLogger(loggerName);
    4140        }
  • proto/pabloj/trunk/src/applicationGenerator/parser/Parser.java

    r2949 r2952  
    66 */
    77
    8 package  compiler.parser;
     8package  applicationGenerator.parser;
    99
     10import applicationGenerator.parser.Parser;
    1011import pabloS.ast.ASTNode;
    1112import pabloS.lexicalAnalyzer.LexicalController;
    1213import pabloS.logging.ScatterLogger;
    13 import compiler.parser.Parser;
    1414
    1515public class Parser {
  • proto/pabloj/trunk/src/applicationGenerator/parser/ParserException.java

    r2949 r2952  
    1 package compiler.parser;
     1package applicationGenerator.parser;
    22
    33public class ParserException extends Exception {
  • proto/pabloj/trunk/src/applicationGenerator/templating/FileTemplate.java

    r2949 r2952  
    1 package compiler.templating;
     1package applicationGenerator.templating;
    22
    33import pabloS.inputHandler.LineBasedReader;
  • proto/pabloj/trunk/src/applicationGenerator/templating/MemoryTemplate.java

    r2949 r2952  
    1 package compiler.templating;
     1package applicationGenerator.templating;
    22
    33import java.io.PrintStream;
  • proto/pabloj/trunk/src/applicationGenerator/templating/Template.java

    r2949 r2952  
    1 package compiler.templating;
     1package applicationGenerator.templating;
    22
    33import java.io.PrintStream;
  • proto/pabloj/trunk/src/compilers/pabloB/lang/Builtins.java

    r2949 r2952  
    1 package compiler.lang.pabloB;
    2 
    3 import java.util.ArrayList;
    4 import java.util.List;
     1package compilers.pabloB.lang;
    52
    63public enum Builtins {
  • proto/pabloj/trunk/src/compilers/pabloB/lang/Builtins2Lang.java

    r2949 r2952  
    1 package compiler.lang.pabloB;
     1package compilers.pabloB.lang;
    22
    33public abstract class Builtins2Lang {
  • proto/pabloj/trunk/src/compilers/pabloS/semanticAnalyzer/SemanticAnalyzer.java

    r2949 r2952  
    1 package compiler.semanticAnalyzer.pabloS;
     1package compilers.pabloS.semanticAnalyzer;
    22
    33public class SemanticAnalyzer {
    4         // TODO
     4
    55}
  • proto/pabloj/trunk/src/test/pabloS/PabloSTestHarness.java

    r2947 r2952  
    1313import  pabloS.logging.ScatterLogger;
    1414
    15 import compiler.test.*;
    16 import compiler.lang.carry.CarryBuiltins2CPP;
    17 import compiler.lang.carry.CarryBuiltins2Lang;
    18 import compiler.lang.pabloS.PabloSBuiltins2CPP;
    19 import compiler.lang.pabloS.Builtins2Lang;
    20 import compiler.lang.pabloS.Builtins;
    21 
    22 import compiler.transformers.pabloS.AdvanceCombinerXFormer;
    23 import compiler.transformers.pabloS.AugAssignXFormer;
    24 import compiler.transformers.pabloS.Bitwise2IDISAXFormer;
    25 import compiler.transformers.pabloS.CarryIntroXFormer;
    26 import compiler.transformers.pabloS.StreamFuncVisitor;
    27 import compiler.transformers.pabloS.helpers.AssertCompare;
     15import compilers.pabloB.lang.carry.CarryBuiltins2CPP;
     16import compilers.pabloB.lang.carry.CarryBuiltins2Lang;
     17import compilers.pabloS.lang.Builtins;
     18import compilers.pabloS.lang.Builtins2Lang;
     19import compilers.pabloS.lang.PabloSBuiltins2CPP;
     20import compilers.pabloS.semanticAnalyzer.helpers.AssertCompare;
     21import compilers.pabloS.semanticAnalyzer.visitors.AdvanceCombinerXFormer;
     22import compilers.pabloS.semanticAnalyzer.visitors.AugAssignXFormer;
     23import compilers.pabloS.semanticAnalyzer.visitors.Bitwise2IDISAXFormer;
     24import compilers.pabloS.semanticAnalyzer.visitors.CarryIntroXFormer;
     25import compilers.pabloS.semanticAnalyzer.visitors.StreamFuncVisitor;
     26import compilers.test.*;
     27
    2828
    2929@SuppressWarnings("unused")
Note: See TracChangeset for help on using the changeset viewer.