mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Bug 352758 - Update some private fields in some scanner parsers to
protected Change-Id: Iea5c586088fa8045e9eb43dff7d43909c0181bd8
This commit is contained in:
parent
f434c8c556
commit
62fda09c13
4 changed files with 15 additions and 15 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2004, 2009 IBM Corporation and others.
|
* Copyright (c) 2004, 2011 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -29,7 +29,7 @@ import org.eclipse.core.resources.IProject;
|
||||||
* @author vhirsl
|
* @author vhirsl
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsoleParser {
|
public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsoleParser {
|
||||||
private static final String[] COMPILER_INVOCATION = {
|
protected static final String[] COMPILER_INVOCATION = {
|
||||||
"gcc", "g++", "cc", "c++" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
"gcc", "g++", "cc", "c++" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||||
};
|
};
|
||||||
protected static final String DASHIDASH= "-I-"; //$NON-NLS-1$
|
protected static final String DASHIDASH= "-I-"; //$NON-NLS-1$
|
||||||
|
@ -37,12 +37,12 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole
|
||||||
protected static final String DASHD= "-D"; //$NON-NLS-1$
|
protected static final String DASHD= "-D"; //$NON-NLS-1$
|
||||||
|
|
||||||
private IProject project;
|
private IProject project;
|
||||||
private IScannerInfoCollector collector;
|
protected IScannerInfoCollector collector;
|
||||||
|
|
||||||
private boolean bMultiline = false;
|
private boolean bMultiline = false;
|
||||||
private String sMultiline = ""; //$NON-NLS-1$
|
private String sMultiline = ""; //$NON-NLS-1$
|
||||||
|
|
||||||
private String[] fCompilerCommands;
|
protected String[] fCompilerCommands;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Returns the project.
|
* @return Returns the project.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2004, 2010 IBM Corporation and others.
|
* Copyright (c) 2004, 2011 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -35,7 +35,7 @@ import org.eclipse.core.runtime.Path;
|
||||||
*/
|
*/
|
||||||
public class GCCScannerInfoConsoleParser extends AbstractGCCBOPConsoleParser {
|
public class GCCScannerInfoConsoleParser extends AbstractGCCBOPConsoleParser {
|
||||||
|
|
||||||
private ScannerInfoConsoleParserUtility fUtil = null;
|
protected ScannerInfoConsoleParserUtility fUtil = null;
|
||||||
private String fDefaultMacroDefinitionValue= "1"; //$NON-NLS-1$
|
private String fDefaultMacroDefinitionValue= "1"; //$NON-NLS-1$
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2004, 2010 IBM Corporation and others.
|
* Copyright (c) 2004, 2011 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -38,11 +38,11 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
|
||||||
private final String DEFINE = "#define"; //$NON-NLS-1$
|
private final String DEFINE = "#define"; //$NON-NLS-1$
|
||||||
|
|
||||||
private IProject fProject = null;
|
private IProject fProject = null;
|
||||||
private IScannerInfoCollector fCollector = null;
|
protected IScannerInfoCollector fCollector = null;
|
||||||
|
|
||||||
private boolean expectingIncludes = false;
|
private boolean expectingIncludes = false;
|
||||||
private List<String> symbols = new ArrayList<String>();
|
protected List<String> symbols = new ArrayList<String>();
|
||||||
private List<String> includes = new ArrayList<String>();
|
protected List<String> includes = new ArrayList<String>();
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
|
* @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006, 2010 IBM Corporation and others.
|
* Copyright (c) 2006, 2011 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -48,7 +48,7 @@ public class XlCSpecsConsoleParser implements IScannerInfoConsoleParser {
|
||||||
.compile("-(?:qgcc_c_stdinc|qc_stdinc|qgcc_cpp_stdinc|qcpp_stdinc)=(.*)"); //$NON-NLS-1$
|
.compile("-(?:qgcc_c_stdinc|qc_stdinc|qgcc_cpp_stdinc|qcpp_stdinc)=(.*)"); //$NON-NLS-1$
|
||||||
|
|
||||||
// xlC compiler constants
|
// xlC compiler constants
|
||||||
final static String [] compilerConstants = {
|
protected final static String [] compilerConstants = {
|
||||||
"__IBMCPP__", //$NON-NLS-1$
|
"__IBMCPP__", //$NON-NLS-1$
|
||||||
"__xlC__", //$NON-NLS-1$
|
"__xlC__", //$NON-NLS-1$
|
||||||
"__IBMC__", //$NON-NLS-1$
|
"__IBMC__", //$NON-NLS-1$
|
||||||
|
@ -57,11 +57,11 @@ public class XlCSpecsConsoleParser implements IScannerInfoConsoleParser {
|
||||||
|
|
||||||
private IProject fProject = null;
|
private IProject fProject = null;
|
||||||
|
|
||||||
private IScannerInfoCollector fCollector = null;
|
protected IScannerInfoCollector fCollector = null;
|
||||||
|
|
||||||
private List<String> symbols = new ArrayList<String>();
|
protected List<String> symbols = new ArrayList<String>();
|
||||||
|
|
||||||
private List<String> includes = new ArrayList<String>();
|
protected List<String> includes = new ArrayList<String>();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* (non-Javadoc)
|
* (non-Javadoc)
|
||||||
|
|
Loading…
Add table
Reference in a new issue